[Pkg-osm-commits] [SCM] josm branch, upstream, updated. upstream/0.0.svn6115+dfsg1-1-g1e3e75e
David Paleino
dapal at debian.org
Fri Dec 20 22:35:08 UTC 2013
The following commit has been merged in the upstream branch:
commit 1e3e75ebb3bd9809d9991a8ea22efb6fafb0e246
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 1f32f02..0197d3c 100644
--- a/CONTRIBUTION
+++ b/CONTRIBUTION
@@ -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.
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 73a9088..ce41f4d 100644
--- a/REVISION
+++ b/REVISION
@@ -1,18 +1,18 @@
<?xml version="1.0"?>
<info>
<entry
- path="trunk"
- revision="6115"
- kind="dir">
+ revision="6502"
+ kind="dir"
+ 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="6115">
-<author>Don-vip</author>
-<date>2013-08-06T22:04:24.793824Z</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 1dd75ef..73da1b4 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,7 +57,8 @@ 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"
@@ -54,15 +66,16 @@ combo: combo box, with multiple choices and possible to enter free form text
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
@@ -81,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
checkgroup: group of checks
columns: number of columns
@@ -143,6 +160,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" />
@@ -156,12 +174,15 @@ Note that for a match, at least one positive and no negative is required.
<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">
@@ -175,19 +196,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" 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">
@@ -196,6 +219,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" />
@@ -209,13 +233,16 @@ Note that for a match, at least one positive and no negative is required.
<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">
@@ -225,7 +252,7 @@ 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" />
@@ -235,13 +262,16 @@ Note that for a match, at least one positive and no negative is required.
<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/>
@@ -250,6 +280,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" />
@@ -280,9 +312,8 @@ 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" length="3" />
@@ -304,7 +335,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" />
@@ -334,9 +367,8 @@ 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" length="3" />
@@ -358,7 +390,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" />
@@ -388,9 +422,8 @@ 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" length="3" />
@@ -412,14 +445,15 @@ Note that for a match, at least one positive and no negative is required.
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)" />
@@ -441,6 +475,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=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" />
@@ -449,6 +484,7 @@ 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)" />
@@ -463,13 +499,42 @@ Note that for a match, at least one positive and no negative is required.
<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" />
+ <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="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,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" />
@@ -495,6 +560,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" />
@@ -525,11 +591,11 @@ 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" />
@@ -552,10 +618,10 @@ Note that for a match, at least one positive and no negative is required.
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>
@@ -569,11 +635,11 @@ Note that for a match, at least one positive and no negative is required.
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" />
@@ -592,14 +658,14 @@ Note that for a match, at least one positive and no negative is required.
</optional>
</item>
<item name="Construction" icon="presets/construction.png" type="way,closedway">
- <label text="Edit Highway Under Construction" />
<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" />
@@ -632,14 +698,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" />
@@ -648,10 +717,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" />
@@ -671,7 +742,8 @@ 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" />
@@ -696,12 +768,13 @@ 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" length="3" />
@@ -709,14 +782,16 @@ Note that for a match, at least one positive and no negative is required.
<text key="maxweight" text="Max. weight (tonnes)" />
<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" />
@@ -731,14 +806,16 @@ Note that for a match, at least one positive and no negative is required.
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" />
@@ -765,11 +842,12 @@ Note that for a match, at least one positive and no negative is required.
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" />
@@ -782,7 +860,7 @@ Note that for a match, at least one positive and no negative is required.
<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">
+ <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" />
@@ -791,7 +869,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="trail_visibility" text="Visibility" values="excellent,good,intermediate,bad,horrible,no" />
+ <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" />
@@ -811,7 +889,6 @@ 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" />
@@ -828,7 +905,7 @@ Note that for a match, at least one positive and no negative is required.
<text key="width" text="Width (meters)" />
</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"
@@ -836,16 +913,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"
@@ -853,10 +934,10 @@ 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" />
@@ -878,7 +959,6 @@ 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" />
@@ -902,7 +982,6 @@ 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" />
@@ -927,11 +1006,13 @@ 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" />
@@ -943,7 +1024,7 @@ Note that for a match, at least one positive and no negative is required.
<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" />
+ <check key="bicycle" text="Bicycle" default="off" />
<text key="width" text="Width (meters)" />
</optional>
</item>
@@ -956,7 +1037,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: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" />
@@ -991,11 +1071,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" />
@@ -1013,20 +1093,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"
@@ -1034,13 +1107,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">
@@ -1057,6 +1131,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">
@@ -1065,33 +1141,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,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">
@@ -1105,21 +1184,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">
@@ -1138,7 +1222,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" />
@@ -1147,22 +1230,23 @@ 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" />
- <space />
<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" />
+ <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"
@@ -1170,19 +1254,21 @@ Note that for a match, at least one positive and no negative is required.
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="bollard" text="Bollard type" values="rising,removable" />
+ <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">
@@ -1191,14 +1277,13 @@ Note that for a match, at least one positive and no negative is required.
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" />
- <space />
<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>
@@ -1206,20 +1291,18 @@ Note that for a match, at least one positive and no negative is required.
<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" />
- <space />
<key key="barrier" value="bus_trap" />
<optional>
<text key="maxwidth" text="Max. width (meters)" length="7" />
@@ -1227,15 +1310,14 @@ Note that for a match, at least one positive and no negative is required.
</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"
@@ -1247,7 +1329,6 @@ Note that for a match, at least one positive and no negative is required.
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" />
@@ -1256,19 +1337,16 @@ 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"
@@ -1279,7 +1357,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:barrier=hedge"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=hedge" />
<label text="Edit Hedge" />
- <space />
<key key="barrier" value="hedge" />
<optional>
<text key="height" text="Height (meters)" length="7" />
@@ -1298,18 +1375,16 @@ 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:barrier=fence"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=fence" />
<label text="Edit Fence" />
- <space />
<key key="barrier" value="fence" />
<optional>
-<!-- <combo key="fence_type" text="Type" values="barbed_wire,chain_link,electric,roundpole,split_rail,wood" /> -->
- <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" />
+ <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" />
- <space />
<key key="barrier" value="guard_rail" />
<optional>
<text key="height" text="Height (meters)" length="7" />
@@ -1325,7 +1400,6 @@ Note that for a match, at least one positive and no negative is required.
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" />
- <space />
<key key="barrier" value="wall" />
<optional>
<text key="height" text="Height (meters)" length="7" />
@@ -1337,7 +1411,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:barrier=city_wall"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=city_wall" />
<label text="Edit City Wall" />
- <space />
<key key="barrier" value="city_wall" />
<optional>
<text key="height" text="Height (meters)" length="7" />
@@ -1346,12 +1419,12 @@ Note that for a match, at least one positive and no negative is required.
<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" />
- <space />
<key key="barrier" value="retaining_wall" />
<optional>
<text key="height" text="Height (meters)" length="7" />
@@ -1363,8 +1436,7 @@ Note that for a match, at least one positive and no negative is required.
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" />
- <space />
+ <label text="Edit Ditch" text_context="Barrier" />
<key key="barrier" value="ditch" />
<optional>
<text key="width" text="Width (meters)" length="7" />
@@ -1372,101 +1444,94 @@ Note that for a match, at least one positive and no negative is required.
</item> <!-- ditch -->
<item name="Kerb" type="way,closedway">
<label text="Edit Kerb" />
- <space />
<key key="barrier" value="kerb" />
<optional>
<text key="height" text="Height (meters)" length="7" />
</optional>
</item> <!-- kerb -->
- <separator/>
-
- <!-- *** access *** -->
- <item name="Entrance" icon="styles/standard/vehicle/entrance.png" type="node">
+ <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" />
- <space />
+ <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/FR: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>
@@ -1474,12 +1539,11 @@ Note that for a match, at least one positive and no negative is required.
<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>
@@ -1488,15 +1552,14 @@ Note that for a match, at least one positive and no negative is required.
<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" />
- <space />
<key key="barrier" value="chain" />
- <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>
@@ -1506,51 +1569,45 @@ Note that for a match, at least one positive and no negative is required.
<label text="Edit Stile" />
<space />
<key key="barrier" value="stile" />
+ <combo key="stile" text="Type" values="ladder,squeezer,stepover" />
<optional>
- <combo key="stile" text="Type" values="ladder,squeezer,stepover" />
<combo key="material" text="Material" values="metal,stone,wood" />
</optional>
- <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> <!-- 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"
- de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=sally_port"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=sally_port" />
+ <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"
@@ -1560,7 +1617,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: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" />
@@ -1568,10 +1625,10 @@ Note that for a match, at least one positive and no negative is required.
<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"
@@ -1581,7 +1638,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: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" />
@@ -1592,12 +1649,14 @@ Note that for a match, at least one positive and no negative is required.
</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" />
@@ -1609,12 +1668,12 @@ Note that for a match, at least one positive and no negative is required.
</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" />
@@ -1626,7 +1685,6 @@ Note that for a match, at least one positive and no negative is required.
</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"
@@ -1636,6 +1694,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: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" />
@@ -1651,7 +1710,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"
@@ -1688,6 +1746,14 @@ Note that for a match, at least one positive and no negative is required.
<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="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"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=canal"
@@ -1718,11 +1784,13 @@ Note that for a match, at least one positive and no negative is required.
<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>
@@ -1748,7 +1816,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" />
@@ -1762,15 +1832,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" />
@@ -1778,13 +1846,13 @@ 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" />
@@ -1813,6 +1881,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>
@@ -1825,11 +1894,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>
@@ -1839,6 +1911,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>
@@ -1848,8 +1921,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>
@@ -1861,17 +1936,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">
@@ -1881,21 +1959,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>
@@ -1909,9 +1991,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"
@@ -1920,7 +2003,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" />
@@ -1929,22 +2011,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" />
@@ -1964,11 +2050,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" />
@@ -1996,30 +2086,27 @@ Note that for a match, at least one positive and no negative is required.
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,freight" />
- <combo key="service" text="Service/Type" 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" lenght="5" />
- <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" length="4"/>
+ <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"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=light_rail" />
+ <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="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
- <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" length="5" />
- <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" length="4" />
+ <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">
@@ -2028,39 +2115,36 @@ Note that for a match, at least one positive and no negative is required.
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" length="5" />
- <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" length="4" />
+ <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="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" length="5" />
- <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" length="4" />
+ <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="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" length="5" />
- <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" length="4" />
+ <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">
@@ -2068,16 +2152,14 @@ Note that for a match, at least one positive and no negative is required.
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 Tram" />
<label text="Edit Subway" />
- <space />
<key key="railway" value="subway" />
<optional>
- <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" length="5" />
- <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" length="4" />
+ <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">
@@ -2086,16 +2168,15 @@ Note that for a match, at least one positive and no negative is required.
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" />
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:railway=tram" />
<label text="Edit Tram" />
- <space />
<key key="railway" value="tram" />
<optional>
- <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" length="5" />
- <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" length="4" />
+ <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">
@@ -2103,7 +2184,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" />
@@ -2121,42 +2201,43 @@ 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" />
+ <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" />
<optional>
- <combo key="service" text="Types" values="yard,siding,spur" />
+ <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/Tag:railway=abandoned" />
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=abandoned" />
<label text="Edit Abandoned Railway" />
- <space />
<key key="railway" value="abandoned" />
<optional>
- <combo key="service" text="Types" values="yard,siding,spur" />
+ <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" />
+ <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">
@@ -2167,6 +2248,7 @@ Note that for a match, at least one positive and no negative is required.
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" />
@@ -2175,7 +2257,7 @@ Note that for a match, at least one positive and no negative is required.
<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" />
+ <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">
@@ -2192,8 +2274,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" />
@@ -2208,6 +2292,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" />
@@ -2218,10 +2303,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" />
@@ -2238,6 +2326,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" />
@@ -2251,6 +2340,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" />
@@ -2263,8 +2353,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" />
@@ -2276,6 +2370,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" />
@@ -2287,6 +2382,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" />
@@ -2298,6 +2394,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" />
@@ -2309,6 +2406,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" />
@@ -2317,8 +2415,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" />
@@ -2330,12 +2429,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>
@@ -2345,17 +2446,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" />
@@ -2371,12 +2475,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" />
@@ -2387,17 +2495,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" />
@@ -2406,7 +2518,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">
@@ -2419,14 +2531,16 @@ 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:" />
<checkgroup columns="2">
@@ -2450,8 +2564,9 @@ Note that for a match, at least one positive and no negative is required.
</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" />
@@ -2459,11 +2574,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">
@@ -2475,31 +2591,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="Tyres" icon="presets/tyres.png" type="node,closedway">
- <label text="Edit Tyres" />
- <key key="shop" value="tyres" />
+ <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" 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="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" 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"
@@ -2508,11 +2640,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"
@@ -2523,47 +2657,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">
@@ -2574,9 +2714,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" />
@@ -2590,19 +2732,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"
@@ -2612,29 +2757,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="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"/>
- <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"/>
+ <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>
@@ -2648,105 +2796,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">
@@ -2755,7 +2913,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" />
@@ -2763,17 +2920,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" />
@@ -2789,9 +2948,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" />
@@ -2804,7 +2963,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" />
@@ -2815,7 +2973,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" />
@@ -2826,8 +2983,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" />
@@ -2850,23 +3007,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" />
@@ -2874,10 +3031,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>
@@ -2888,6 +3049,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>
@@ -2922,6 +3084,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" />
@@ -2936,42 +3099,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>
@@ -2981,12 +3147,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" />
@@ -3005,8 +3174,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" />
@@ -3025,8 +3196,10 @@ Note that for a match, at least one positive and no negative is required.
<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" />
@@ -3045,9 +3218,11 @@ 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" />
@@ -3067,9 +3242,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"
+ 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" />
@@ -3090,8 +3267,10 @@ Note that for a match, at least one positive and no negative is required.
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" />
+ 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" />
@@ -3111,8 +3290,10 @@ Note that for a match, at least one positive and no negative is required.
<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" />
@@ -3139,9 +3320,11 @@ 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"
+ 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" />
@@ -3168,12 +3351,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" />
@@ -3193,11 +3377,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" />
@@ -3215,10 +3400,11 @@ 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=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" />
<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" />
<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" />
@@ -3233,17 +3419,20 @@ Note that for a match, at least one positive and no negative is required.
<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"
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" />
@@ -3262,11 +3451,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" />
@@ -3285,11 +3475,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=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" />
<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" />
@@ -3311,10 +3502,11 @@ Note that for a match, at least one positive and no negative is required.
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" />
<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" />
<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" />
@@ -3328,17 +3520,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" />
<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" />
<space />
<combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
<combo key="wheelchair" text="Wheelchairs" values="yes,no" />
@@ -3350,6 +3545,7 @@ Note that for a match, at least one positive and no negative is required.
</item>
<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" />
@@ -3358,7 +3554,7 @@ Note that for a match, at least one positive and no negative is required.
<key key="amenity" value="stripclub" />
<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" />
<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" />
@@ -3374,17 +3570,21 @@ Note that for a match, at least one positive and no negative is required.
<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" />-->
@@ -3395,58 +3595,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" />
@@ -3454,9 +3670,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" />
@@ -3468,12 +3688,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" />
@@ -3488,19 +3711,22 @@ 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" values="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="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" />
@@ -3513,27 +3739,31 @@ Note that for a match, at least one positive and no negative is required.
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" />
+ 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" />
<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" />
<space />
<text key="phone" text="Phone Number" />
<text key="fax" text="Fax Number" />
@@ -3546,13 +3776,14 @@ Note that for a match, at least one positive and no negative is required.
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:leisurem=water_park"
- ru.href="http://wiki.openstreetmap.org/wiki/RU: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" values="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 />
<text key="phone" text="Phone Number" />
<text key="fax" text="Fax Number" />
@@ -3565,10 +3796,11 @@ 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=sauna"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=sauna" />
<label text="Edit Sauna" />
+ <space />
<key key="leisure" value="sauna" />
<text key="name" text="Name" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="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="access" text="Access" values="yes,permissive,private,unknown" />
<space />
<text key="phone" text="Phone Number" />
@@ -3579,10 +3811,11 @@ Note that for a match, at least one positive and no negative is required.
<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" values="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="fee" text="Fee" />
<space />
<text key="phone" text="Phone Number" />
@@ -3593,14 +3826,17 @@ Note that for a match, at least one positive and no negative is required.
<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" 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="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
<combo key="wheelchair" text="Wheelchairs" values="yes,no" />
@@ -3622,11 +3858,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" />
@@ -3637,19 +3875,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>
@@ -3662,13 +3901,15 @@ Note that for a match, at least one positive and no negative is required.
<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" />
<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" />
<text key="wikipedia" text="Wikipedia" />
</item>
<item name="Theatre" icon="presets/theater.png" type="node,closedway,relation">
@@ -3678,6 +3919,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=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" />
@@ -3685,16 +3927,18 @@ Note that for a match, at least one positive and no negative is required.
<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" />
<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="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,relation">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre"
@@ -3703,6 +3947,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>
@@ -3712,30 +3957,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,roman_catholic,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"
@@ -3748,8 +3977,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"
@@ -3757,21 +4150,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"
@@ -3783,8 +4179,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"
@@ -3792,6 +4188,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>
@@ -3802,6 +4199,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>
@@ -3812,6 +4210,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>
@@ -3825,6 +4224,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>
@@ -3834,29 +4234,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>
@@ -3872,6 +4278,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>
@@ -3879,47 +4286,62 @@ 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="Clinic" icon="styles/standard/health/hospital.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clinic"
@@ -3931,20 +4353,24 @@ Note that for a match, at least one positive and no negative is required.
<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" />
@@ -3956,6 +4382,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" />
@@ -3970,28 +4397,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"
@@ -4001,9 +4431,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">
@@ -4026,38 +4457,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="description" text="Description" />
- <combo key="drinking_water" text="Drinking water" values="yes,no" />
- <combo key="fee" text="Fee" values="yes,no" />
- <text key="operator" text="Operator" />
- <combo key="wheelchair" text="Wheelchair" values="no,limited,yes" />
+ <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"
@@ -4068,6 +4519,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" />
@@ -4077,6 +4529,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"
@@ -4086,8 +4575,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" />
@@ -4103,8 +4592,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" />
@@ -4120,28 +4612,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" />
@@ -4150,15 +4649,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" />
@@ -4167,12 +4668,15 @@ 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 Source of Potable Water" />
+ <space />
<key key="amenity" value="drinking_water" />
- <combo key="indoor" text="Indoor" values="yes,no" />
+ <check key="indoor" text="Indoor" default="off" />
<optional>
<text key="name" text="Name" />
<text key="description" text="Description" />
@@ -4187,6 +4691,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" />
@@ -4195,9 +4700,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 -->
@@ -4205,173 +4710,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="pitch,sports_centre,stadium,track" values_context="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" values_context="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="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"
@@ -4380,86 +4903,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 />
@@ -4479,123 +5013,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 -->
@@ -4605,7 +5157,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"
@@ -4615,7 +5167,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">
@@ -4629,11 +5182,26 @@ Note that for a match, at least one positive and no negative is required.
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" />
@@ -4650,6 +5218,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>
@@ -4664,15 +5233,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>
@@ -4680,8 +5252,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" />
@@ -4690,8 +5263,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>
@@ -4700,6 +5275,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" />
@@ -4712,9 +5288,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" />
@@ -4725,11 +5304,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" />
@@ -4748,14 +5329,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,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" />
@@ -4764,11 +5348,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>
@@ -4776,18 +5362,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>
@@ -4796,49 +5386,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"
@@ -4846,55 +5504,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">
@@ -4907,8 +5625,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"
@@ -4919,18 +5641,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>
@@ -4939,17 +5672,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"
@@ -4958,54 +5694,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>
@@ -5014,46 +5761,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"
@@ -5064,40 +5824,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">
@@ -5114,183 +5884,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" />
+ <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>
+ <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" />
- <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"
- ru.href="http://wiki.openstreetmap.org/wiki/RU: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"/>
+ 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="yes,no,only" />
+ <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">
@@ -5298,16 +6136,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">
@@ -5318,9 +6160,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"
@@ -5330,12 +6173,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">
@@ -5344,65 +6201,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" 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" 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" />
+ <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"
@@ -5412,109 +6306,160 @@ 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>
<item name="Newsagent's shop" icon="presets/kiosk.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=newsagent"
@@ -5529,36 +6474,46 @@ Note that for a match, at least one positive and no negative is required.
</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">
@@ -5567,8 +6522,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" />
@@ -5580,7 +6536,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" />
@@ -5683,6 +6639,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" />
@@ -5729,6 +6686,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 />
@@ -5743,6 +6701,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" />
@@ -5752,22 +6711,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" />
@@ -5776,8 +6751,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" />
@@ -5785,8 +6762,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" />
@@ -5820,17 +6799,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"
@@ -5839,9 +6835,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"
@@ -5862,7 +6859,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" />
@@ -5871,12 +6869,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>
@@ -5886,11 +6886,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>
@@ -5898,9 +6900,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>
@@ -5911,6 +6915,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 />
@@ -5929,6 +6934,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 />
@@ -5955,6 +6972,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>
@@ -5967,6 +6985,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" />
@@ -5978,11 +6997,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>
@@ -5998,7 +7019,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" />
@@ -6010,12 +7031,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">
@@ -6026,27 +7049,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" />
@@ -6076,6 +7117,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" />
@@ -6083,41 +7128,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" />
@@ -6130,11 +7241,24 @@ Note that for a match, at least one positive and no negative is required.
</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" />
@@ -6149,6 +7273,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" />
@@ -6189,10 +7319,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>
@@ -6204,8 +7335,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>
@@ -6225,10 +7358,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>
@@ -6243,8 +7377,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)" />
@@ -6265,10 +7401,12 @@ Note that for a match, at least one positive and no negative is required.
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"/>
+ 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" />
@@ -6292,9 +7430,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>
@@ -6306,12 +7445,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>
@@ -6321,8 +7462,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>
@@ -6338,8 +7480,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)" />
@@ -6356,10 +7500,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" />
@@ -6374,14 +7519,16 @@ 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" length="3" />
<text key="name" text="Name" />
@@ -6392,13 +7539,14 @@ 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" length="3" />
<text key="name" text="Name" />
@@ -6407,8 +7555,8 @@ Note that for a match, at least one positive and no negative is required.
<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/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 10ec1c8..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,8 +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="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>
@@ -150,8 +179,10 @@
<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" />
@@ -165,10 +196,10 @@
</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>
+ <!-- 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" />
@@ -176,6 +207,7 @@
<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" />
@@ -189,15 +221,15 @@
<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="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" />
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 53%
rename from data/tagchecker.cfg
rename to data/validator/tagchecker.cfg
index 7c84929..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,21 +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
+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
@@ -79,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
@@ -91,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
@@ -140,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 != * && cycleway != * && footway != * && barrier != * && man_made != * # width without physical linear feature
-* : 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
@@ -163,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 046a771..4cf110b 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-08-04 03:41+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-08-05 04:31+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 ""
@@ -250,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -289,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -343,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 ""
@@ -523,6 +529,9 @@ msgstr "Geskiedenis"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -636,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 ""
@@ -786,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"
@@ -972,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 ""
@@ -995,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>"
@@ -1163,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1304,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"
@@ -1399,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 ""
@@ -1683,6 +1703,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1902,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] ""
@@ -2328,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 ""
@@ -2524,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 ""
@@ -2611,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 ""
@@ -2647,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"
@@ -2673,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}''"
@@ -2778,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] ""
@@ -2838,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"
@@ -2869,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"
@@ -2893,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 ""
@@ -2923,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 ""
@@ -2943,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 ""
@@ -2952,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 ""
@@ -2972,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}"
@@ -3003,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}''."
@@ -3160,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 ""
@@ -3268,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 ""
@@ -3306,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3347,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3371,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 ""
@@ -3430,6 +3469,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3512,6 +3554,15 @@ 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 ""
@@ -3581,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 ""
@@ -3638,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})"
@@ -3676,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}"
@@ -3813,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"
@@ -3888,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 ""
@@ -3918,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3945,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''"
@@ -4011,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 ""
@@ -4131,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"
@@ -4360,6 +4400,18 @@ 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 ""
@@ -4464,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 ""
@@ -4764,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"
@@ -4801,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"
@@ -4853,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 ""
@@ -5110,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 ""
@@ -5638,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5721,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 ""
@@ -5811,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 ""
@@ -5982,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 ""
@@ -6269,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"
@@ -6335,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"
@@ -6377,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)"
@@ -6537,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"
@@ -6855,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 ""
@@ -6986,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 ""
@@ -7010,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 ""
@@ -7123,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."
@@ -7222,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7309,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"
@@ -7328,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 ""
@@ -7394,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"
@@ -7470,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 ""
@@ -7485,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"
@@ -7701,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 "
@@ -7715,13 +7795,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7730,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 ""
@@ -7737,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 ..."
@@ -7850,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] ""
@@ -7862,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>"
@@ -7878,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:"
@@ -8024,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8054,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"
@@ -8407,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8428,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 ""
@@ -8485,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8551,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 ""
@@ -8734,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}''..."
@@ -8756,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"
@@ -8766,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:"
@@ -8987,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}''"
@@ -9702,6 +9811,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9770,6 +9912,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9823,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 ""
@@ -10279,6 +10429,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 ""
@@ -10342,7 +10498,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 ""
@@ -10600,40 +10756,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}''"
@@ -10686,8 +10842,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:"
@@ -10696,20 +10852,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 ""
@@ -10791,14 +10952,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,7 +11026,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10950,9 +11105,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10971,6 +11123,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 ""
@@ -11000,9 +11160,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 ""
@@ -11033,7 +11233,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 ""
@@ -11073,28 +11273,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..."
@@ -11189,6 +11387,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11204,12 +11405,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}."
@@ -11288,7 +11497,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11387,35 +11596,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 ""
@@ -11425,8 +11610,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 ..."
@@ -11453,10 +11638,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>"
@@ -11540,8 +11722,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}."
@@ -11738,7 +11920,7 @@ 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}"
@@ -11784,6 +11966,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."
@@ -11814,19 +12005,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 ""
@@ -11848,11 +12039,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 ""
@@ -11922,13 +12125,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}''"
@@ -12071,10 +12274,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"
@@ -12089,22 +12292,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}''"
@@ -12173,8 +12375,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..."
@@ -12189,9 +12390,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}''"
@@ -12513,12 +12729,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12529,30 +12744,73 @@ 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 "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] ""
+
+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"
@@ -12563,9 +12821,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."
@@ -12888,6 +13160,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 ""
@@ -13127,6 +13404,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."
@@ -13176,9 +13456,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 ""
@@ -13215,6 +13492,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 ""
@@ -13345,6 +13627,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13435,6 +13720,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 ""
@@ -13453,10 +13782,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 +13797,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13495,18 +13827,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 ""
@@ -13516,9 +13842,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13528,13 +13851,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13582,6 +13905,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13666,6 +13992,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13770,21 +14099,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 ""
@@ -13800,10 +14138,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"
@@ -13839,7 +14177,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13908,12 +14246,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 ""
@@ -13929,15 +14273,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 ""
@@ -13959,6 +14294,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13968,6 +14312,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13977,10 +14324,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14013,9 +14357,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14058,6 +14399,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14073,6 +14420,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14142,19 +14492,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14185,6 +14529,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14194,10 +14539,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14251,12 +14596,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14317,12 +14656,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14362,9 +14710,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14398,6 +14743,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 ""
@@ -14479,18 +14839,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 ""
@@ -14566,7 +14931,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14590,10 +14955,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"
@@ -14605,9 +14973,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14659,6 +15024,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14671,6 +15039,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14782,11 +15185,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14798,11 +15199,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14821,10 +15220,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14854,9 +15253,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14878,10 +15274,29 @@ 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"
@@ -15031,6 +15446,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15052,6 +15470,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15079,6 +15503,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15103,22 +15533,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 ""
@@ -15140,9 +15554,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15337,6 +15748,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15367,6 +15781,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15379,9 +15796,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15391,9 +15805,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15406,6 +15825,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15430,14 +15852,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15486,7 +15900,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15540,41 +15954,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"
@@ -15766,9 +16180,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15790,9 +16201,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15805,6 +16222,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15844,6 +16264,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15865,22 +16288,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"
@@ -16010,49 +16445,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"
@@ -16070,6 +16499,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16082,6 +16517,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16100,37 +16538,137 @@ 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"
@@ -16220,6 +16758,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 ""
@@ -16301,128 +16845,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16453,16 +17075,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16496,6 +17124,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16533,117 +17164,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 ""
@@ -16677,33 +17344,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 ""
@@ -16737,6 +17414,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 ""
@@ -16837,36 +17530,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 ""
@@ -16909,19 +17620,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 ""
@@ -17060,6 +17767,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 ""
@@ -17072,60 +17791,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 ""
@@ -17350,41 +18143,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"
@@ -17393,7 +18212,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17405,12 +18224,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 ""
@@ -17462,88 +18371,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17555,6 +18567,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 ""
@@ -17570,6 +18597,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17588,11 +18618,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17701,10 +18729,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17716,7 +18744,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17737,6 +18765,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17749,9 +18780,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17821,7 +18849,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17842,13 +18870,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"
@@ -17857,7 +18885,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17885,6 +18912,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17921,10 +18954,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"
@@ -17954,7 +19008,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17966,19 +19020,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"
@@ -18014,7 +19068,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18227,6 +19281,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18266,24 +19326,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 ""
@@ -18293,15 +19362,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18377,6 +19437,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18431,7 +19497,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18443,6 +19509,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18479,43 +19548,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18554,6 +19650,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18722,21 +19830,50 @@ 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 ""
+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 ""
@@ -18782,19 +19919,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"
@@ -18818,7 +19958,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18914,18 +20054,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 ""
@@ -18935,7 +20084,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18944,10 +20096,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18965,6 +20117,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18980,28 +20135,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"
@@ -19022,19 +20177,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"
@@ -19109,10 +20264,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19127,9 +20285,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19157,6 +20312,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19202,10 +20360,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"
@@ -19217,7 +20405,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"
@@ -19235,7 +20423,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19352,19 +20540,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 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"
@@ -19383,7 +20682,46 @@ 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 "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 "Landsat"
@@ -19395,19 +20733,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 "skobbler heatmap"
@@ -19428,7 +20775,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19437,6 +20784,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19583,6 +20933,29 @@ 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 ""
@@ -19748,6 +21121,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19793,6 +21169,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19979,19 +21388,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20015,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}''."
@@ -20284,10 +21699,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20491,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"
@@ -20762,15 +22180,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20941,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 ""
@@ -20959,12 +22371,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21100,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 ""
@@ -21117,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 ""
@@ -21343,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."
@@ -21393,7 +22808,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21578,6 +22993,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21617,27 +23097,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 ""
@@ -22715,9 +24177,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 ""
@@ -23364,9 +24843,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23419,18 +24895,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 ""
@@ -23777,6 +25241,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23928,6 +25413,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 ""
@@ -24245,9 +25733,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24463,6 +25948,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 ""
@@ -24495,15 +25983,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 ""
@@ -24618,9 +26122,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24799,19 +26300,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"
@@ -25027,6 +26528,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 ""
@@ -25063,6 +26653,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..."
@@ -25215,9 +26808,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26203,9 +27793,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26484,9 +28071,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 703ed98..8b536b0 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-08-04 03:41+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-08-05 04:32+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 ""
@@ -250,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -289,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -343,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 ""
@@ -523,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -636,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 ""
@@ -786,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"
@@ -972,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 ""
@@ -995,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>"
@@ -1163,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1304,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"
@@ -1399,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 ""
@@ -1683,6 +1703,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1902,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] ""
@@ -2328,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 ""
@@ -2524,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 ""
@@ -2611,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 ""
@@ -2647,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"
@@ -2673,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}''"
@@ -2778,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] ""
@@ -2838,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"
@@ -2869,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"
@@ -2893,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 ""
@@ -2923,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 ""
@@ -2943,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 ""
@@ -2952,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 ""
@@ -2972,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}"
@@ -3003,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}''."
@@ -3160,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 ""
@@ -3268,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 ""
@@ -3306,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3347,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3371,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 ""
@@ -3430,6 +3469,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3512,6 +3554,15 @@ 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 ""
@@ -3581,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 ""
@@ -3638,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})"
@@ -3676,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}"
@@ -3813,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"
@@ -3888,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 ""
@@ -3918,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3945,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''"
@@ -4011,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 ""
@@ -4131,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"
@@ -4360,6 +4400,18 @@ 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 ""
@@ -4464,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 ""
@@ -4764,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"
@@ -4801,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"
@@ -4853,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 ""
@@ -5110,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 ""
@@ -5638,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5721,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 ""
@@ -5811,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 ""
@@ -5982,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 ""
@@ -6269,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"
@@ -6335,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"
@@ -6377,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)"
@@ -6537,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"
@@ -6855,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 ""
@@ -6986,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 ""
@@ -7010,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 ""
@@ -7123,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."
@@ -7222,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7309,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"
@@ -7328,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 ""
@@ -7394,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"
@@ -7470,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 ""
@@ -7485,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"
@@ -7701,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 "
@@ -7715,13 +7795,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7730,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 ""
@@ -7737,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 ..."
@@ -7850,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] ""
@@ -7862,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>"
@@ -7878,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:"
@@ -8024,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8054,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"
@@ -8407,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8428,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 ""
@@ -8485,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8551,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 ""
@@ -8734,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}''..."
@@ -8756,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"
@@ -8766,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:"
@@ -8987,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}''"
@@ -9702,6 +9811,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9770,6 +9912,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9823,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 ""
@@ -10279,6 +10429,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 ""
@@ -10342,7 +10498,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 ""
@@ -10600,40 +10756,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}''"
@@ -10686,8 +10842,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:"
@@ -10696,20 +10852,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 ""
@@ -10791,14 +10952,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,7 +11026,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10950,9 +11105,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10971,6 +11123,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 ""
@@ -11000,9 +11160,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 ""
@@ -11033,7 +11233,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 ""
@@ -11073,28 +11273,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..."
@@ -11189,6 +11387,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11204,12 +11405,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}."
@@ -11288,7 +11497,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11387,35 +11596,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 ""
@@ -11425,8 +11610,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 ..."
@@ -11453,10 +11638,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>"
@@ -11540,8 +11722,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}."
@@ -11738,7 +11920,7 @@ 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}"
@@ -11784,6 +11966,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."
@@ -11814,19 +12005,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 ""
@@ -11848,11 +12039,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 ""
@@ -11922,13 +12125,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}''"
@@ -12071,10 +12274,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"
@@ -12089,22 +12292,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}''"
@@ -12173,8 +12375,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..."
@@ -12189,9 +12390,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}''"
@@ -12513,12 +12729,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12529,30 +12744,73 @@ 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 "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] ""
+
+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"
@@ -12563,9 +12821,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."
@@ -12888,6 +13160,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 ""
@@ -13127,6 +13404,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."
@@ -13176,9 +13456,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 ""
@@ -13215,6 +13492,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 ""
@@ -13345,6 +13627,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13435,6 +13720,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 ""
@@ -13453,10 +13782,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 +13797,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13495,18 +13827,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 ""
@@ -13516,9 +13842,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13528,13 +13851,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13582,6 +13905,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13666,6 +13992,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13770,21 +14099,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 ""
@@ -13800,10 +14138,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"
@@ -13839,7 +14177,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13908,12 +14246,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 ""
@@ -13929,15 +14273,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 ""
@@ -13959,6 +14294,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13968,6 +14312,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13977,10 +14324,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14013,9 +14357,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14058,6 +14399,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14073,6 +14420,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14142,19 +14492,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14185,6 +14529,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14194,10 +14539,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14251,12 +14596,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14317,12 +14656,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14362,9 +14710,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14398,6 +14743,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 ""
@@ -14479,18 +14839,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 ""
@@ -14566,7 +14931,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14590,10 +14955,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"
@@ -14605,9 +14973,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14659,6 +15024,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14671,6 +15039,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14782,11 +15185,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14798,11 +15199,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14821,10 +15220,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14854,9 +15253,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14878,10 +15274,29 @@ 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"
@@ -15031,6 +15446,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15052,6 +15470,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15079,6 +15503,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15103,22 +15533,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 ""
@@ -15140,9 +15554,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15337,6 +15748,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15367,6 +15781,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15379,9 +15796,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15391,9 +15805,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15406,6 +15825,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15430,14 +15852,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15486,7 +15900,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15540,41 +15954,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"
@@ -15766,9 +16180,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15790,9 +16201,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15805,6 +16222,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15844,6 +16264,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15865,22 +16288,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"
@@ -16010,49 +16445,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"
@@ -16070,6 +16499,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16082,6 +16517,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16100,37 +16538,137 @@ 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"
@@ -16220,6 +16758,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 ""
@@ -16301,128 +16845,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16453,16 +17075,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16496,6 +17124,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16533,117 +17164,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 ""
@@ -16677,33 +17344,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 ""
@@ -16737,6 +17414,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 ""
@@ -16837,36 +17530,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 ""
@@ -16909,19 +17620,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 ""
@@ -17060,6 +17767,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 ""
@@ -17072,60 +17791,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 ""
@@ -17350,41 +18143,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"
@@ -17393,7 +18212,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17405,12 +18224,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 ""
@@ -17462,88 +18371,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17555,6 +18567,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 ""
@@ -17570,6 +18597,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17588,11 +18618,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17701,10 +18729,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17716,7 +18744,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17737,6 +18765,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17749,9 +18780,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17821,7 +18849,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17842,13 +18870,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"
@@ -17857,7 +18885,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17885,6 +18912,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17921,10 +18954,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"
@@ -17954,7 +19008,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17966,19 +19020,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"
@@ -18014,7 +19068,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18227,6 +19281,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18266,24 +19326,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 ""
@@ -18293,15 +19362,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18377,6 +19437,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18431,7 +19497,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18443,6 +19509,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18479,43 +19548,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18554,6 +19650,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18722,21 +19830,50 @@ 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 ""
+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 ""
@@ -18782,19 +19919,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"
@@ -18818,7 +19958,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18914,18 +20054,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 ""
@@ -18935,7 +20084,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18944,10 +20096,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18965,6 +20117,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18980,28 +20135,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"
@@ -19022,19 +20177,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"
@@ -19109,10 +20264,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19127,9 +20285,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19157,6 +20312,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19202,10 +20360,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"
@@ -19217,7 +20405,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"
@@ -19235,7 +20423,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19352,19 +20540,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 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"
@@ -19383,7 +20682,46 @@ 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 "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 "Landsat"
@@ -19395,19 +20733,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 "skobbler heatmap"
@@ -19428,7 +20775,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19437,6 +20784,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19583,6 +20933,29 @@ 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 ""
@@ -19748,6 +21121,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19793,6 +21169,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19979,19 +21388,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20015,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}''."
@@ -20284,10 +21699,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20491,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"
@@ -20762,15 +22180,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20941,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 ""
@@ -20959,12 +22371,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21100,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 ""
@@ -21117,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 ""
@@ -21343,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."
@@ -21393,7 +22808,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21578,6 +22993,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21617,27 +23097,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 ""
@@ -22715,9 +24177,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 ""
@@ -23364,9 +24843,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23419,18 +24895,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 ""
@@ -23777,6 +25241,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23928,6 +25413,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 ""
@@ -24245,9 +25733,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24463,6 +25948,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 ""
@@ -24495,15 +25983,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 ""
@@ -24618,9 +26122,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24799,19 +26300,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"
@@ -25027,6 +26528,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 ""
@@ -25063,6 +26653,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..."
@@ -25215,9 +26808,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26203,9 +27793,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26484,9 +28071,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 cb9cf67..82865a3 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-08-04 03:41+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-08-05 04:32+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -60,6 +63,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -160,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 ""
@@ -251,9 +257,6 @@ msgstr "العدة: {0}"
msgid "Please select at least four nodes."
msgstr "الرجاء إختيار أربعة عقد على الأقل."
-msgid "Information"
-msgstr "المعلومات"
-
msgid "Align Nodes in Line"
msgstr "صفّ العقد في خطّ مستقيم"
@@ -290,6 +293,9 @@ msgstr "التالي"
msgid "Nothing selected to zoom to."
msgstr "لا يوجد شيء محدد للتكبير/للتصغير."
+msgid "Information"
+msgstr "المعلومات"
+
msgid "Zoom to {0}"
msgstr "زوم الى {0}"
@@ -345,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} طرقات"
@@ -525,6 +531,9 @@ msgstr "الخط الزمني"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -638,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 ""
@@ -788,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"
@@ -974,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 ""
@@ -997,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>"
@@ -1165,9 +1167,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1310,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"
@@ -1405,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 "تَراجَع"
@@ -1689,6 +1709,9 @@ 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} )"
@@ -1908,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] ""
@@ -2334,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 ""
@@ -2530,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 ""
@@ -2617,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 ""
@@ -2653,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"
@@ -2680,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}''"
@@ -2785,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] ""
@@ -2845,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"
@@ -2876,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 ""
@@ -2900,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 ""
@@ -2930,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 ""
@@ -2950,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 ""
@@ -2959,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 ""
@@ -2979,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}"
@@ -3010,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}''."
@@ -3179,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 ""
@@ -3287,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 ""
@@ -3325,9 +3355,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3366,6 +3393,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "عناوين"
@@ -3390,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 ""
@@ -3449,6 +3488,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3531,6 +3573,15 @@ 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 "متعدد الضلوع"
@@ -3600,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 ""
@@ -3657,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})"
@@ -3695,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}"
@@ -3832,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"
@@ -3907,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 ""
@@ -3937,9 +3997,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3964,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''"
@@ -4030,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 ""
@@ -4154,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"
@@ -4383,6 +4423,18 @@ 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 "سمعيّ"
@@ -4487,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 ""
@@ -4787,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 "> 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,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"
@@ -4876,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 ""
@@ -5137,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 ""
@@ -5665,6 +5714,9 @@ msgstr "عرض/إخفاء"
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5748,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 "العلاقات"
@@ -5838,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 ""
@@ -6009,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 ""
@@ -6296,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"
@@ -6362,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 "خصائص/عضويات"
+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 "غيّر العلاقة"
@@ -6404,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)"
@@ -6564,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"
@@ -6882,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 "إشارات مرجعية"
@@ -7013,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, "
@@ -7037,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 ""
@@ -7150,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."
@@ -7249,6 +7328,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7336,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"
@@ -7356,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 ""
@@ -7422,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"
@@ -7498,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 ""
@@ -7513,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"
@@ -7729,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 "
@@ -7743,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 ""
@@ -7758,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 ""
@@ -7765,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 ..."
@@ -7878,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] ""
@@ -7890,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>"
@@ -7906,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:"
@@ -8052,7 +8163,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8082,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"
@@ -8435,9 +8546,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8456,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 ""
@@ -8513,6 +8624,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8579,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 ""
@@ -8766,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}''..."
@@ -8788,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"
@@ -8798,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:"
@@ -9019,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}''"
@@ -9735,6 +9844,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9803,6 +9945,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9856,6 +10001,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 ""
@@ -10313,6 +10463,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 ""
@@ -10376,7 +10532,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 ""
@@ -10634,40 +10790,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}''"
@@ -10720,8 +10876,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:"
@@ -10730,20 +10886,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 ""
@@ -10825,14 +10986,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"
@@ -10909,8 +11064,8 @@ msgstr "طبّق الخيار المسبق"
msgid "New relation"
msgstr ""
-msgid "Change Properties"
-msgstr "غيّر الخصائص"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -10988,9 +11143,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr "خطأ في التحليل النحوي {0}: "
@@ -11009,6 +11161,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 ""
@@ -11038,9 +11198,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 ""
@@ -11071,7 +11271,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 ""
@@ -11111,28 +11311,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..."
@@ -11229,6 +11427,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11244,12 +11445,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}."
@@ -11328,8 +11537,8 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
-msgstr "نجاح إسيراد NMEA"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "فشل إستيراد NMEA !"
@@ -11427,35 +11636,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 ""
@@ -11465,8 +11650,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 ..."
@@ -11493,10 +11678,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>"
@@ -11580,8 +11762,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}."
@@ -11778,7 +11960,7 @@ 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}"
@@ -11824,6 +12006,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."
@@ -11854,19 +12045,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 ""
@@ -11888,11 +12079,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 ""
@@ -11962,13 +12165,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}''"
@@ -12111,10 +12314,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"
@@ -12129,22 +12332,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}''"
@@ -12213,8 +12415,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..."
@@ -12229,9 +12430,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}''"
@@ -12553,12 +12769,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12569,21 +12784,64 @@ 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 "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 ""
+
+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):"
@@ -12603,9 +12861,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."
@@ -12928,6 +13200,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 ""
@@ -13167,6 +13444,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."
@@ -13216,9 +13496,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 ""
@@ -13255,6 +13532,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 ""
@@ -13385,6 +13667,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13475,6 +13760,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 ""
@@ -13493,10 +13822,10 @@ msgstr "مساحة"
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13508,6 +13837,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13535,18 +13867,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 ""
@@ -13556,9 +13882,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13568,13 +13891,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13622,6 +13945,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13706,6 +14032,9 @@ msgstr "حرّر جسر"
msgid "viaduct"
msgstr "جسر"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13810,21 +14139,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 ""
@@ -13840,10 +14178,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"
@@ -13879,7 +14217,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13948,12 +14286,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 "نوع التقاطع للمشاة"
@@ -13969,15 +14313,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 ""
@@ -13999,6 +14334,15 @@ msgstr ""
msgid "tiger"
msgstr "نمر"
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr "إشارة وقوف"
@@ -14008,6 +14352,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "مستديرة صغيرة"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "الإتجاه"
@@ -14017,10 +14364,7 @@ msgstr "إتجاه عقارب الساعة"
msgid "Pedestrian Crossing"
msgstr "تقاطع مشاة"
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14053,9 +14397,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14098,6 +14439,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr "السير المسموح:"
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14113,6 +14460,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr "حاجز دراجة"
@@ -14182,19 +14532,16 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
-msgstr ""
-
-msgid "split_rail"
+msgid "pole"
msgstr ""
-msgid "chain"
+msgid "Guard Rail"
msgstr ""
-msgid "hedge"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14225,6 +14572,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14234,10 +14582,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14279,6 +14627,21 @@ msgstr ""
msgid "Stile"
msgstr ""
+msgid "Edit Chain"
+msgstr ""
+
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
+msgid "Turnstile"
+msgstr ""
+
msgid "Edit Stile"
msgstr ""
@@ -14357,12 +14720,21 @@ msgstr "حرّر مسرب"
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr "جدول نهر"
msgid "Edit Stream"
msgstr "حرّر جدول نهر"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "قناة"
@@ -14402,9 +14774,6 @@ msgstr "حرّر سدّ"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14438,6 +14807,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 "الأرض اليابسة"
@@ -14519,18 +14903,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 ""
@@ -14606,7 +14995,7 @@ msgstr "سياحة"
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14630,10 +15019,13 @@ msgstr ""
msgid "rail"
msgstr "سكة حديد"
-msgid "Voltage"
-msgstr "التوتر"
+msgid "Voltage in Volts (V)"
+msgstr ""
-msgid "Frequency (Hz)"
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
+
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14645,9 +15037,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr "قطار ذات سكة حديد واحدة"
@@ -14699,6 +15088,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14711,18 +15103,32 @@ msgstr ""
msgid "Barrier"
msgstr ""
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
msgid "half"
-msgstr "نصف"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "ملء"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "double_half"
msgstr ""
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14822,11 +15228,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14838,11 +15242,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14861,10 +15263,10 @@ msgstr "مساحة"
msgid "underground"
msgstr "تحت الأرض"
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14894,9 +15296,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "إستيعاب"
@@ -14918,10 +15317,29 @@ 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"
@@ -15071,6 +15489,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr "التوتر"
+
msgid "Amperage"
msgstr ""
@@ -15092,6 +15513,12 @@ msgstr "تصليح سيارات"
msgid "Edit Car Repair"
msgstr "حرّر تصليح سيارات"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15119,8 +15546,14 @@ msgstr "إستئجار سيارة"
msgid "Edit Car Rental"
msgstr "حرّر إستئجار سيارة"
-msgid "Sharing"
-msgstr "مشاركة السيارة"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
+msgid "Sharing"
+msgstr "مشاركة السيارة"
msgid "Edit Car Sharing"
msgstr "حرّر مشاركة السيارة"
@@ -15143,22 +15576,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 ""
@@ -15180,9 +15597,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "ملابس"
@@ -15377,6 +15791,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15407,6 +15824,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15419,9 +15839,6 @@ msgstr "مناسب لكرسي المقعدين"
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15431,9 +15848,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr "مبنى"
@@ -15446,6 +15868,9 @@ msgstr "حرّر مدخل قطار نفقي"
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15470,14 +15895,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15526,8 +15943,8 @@ msgstr ""
msgid "Taxi"
msgstr "تاكسي"
-msgid "Edit Taxi station"
-msgstr "حرّر موقف تاكسي"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "مطار"
@@ -15580,6 +15997,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 ""
@@ -15602,21 +16034,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 ""
@@ -15806,9 +16223,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr "سياحة"
@@ -15830,9 +16244,15 @@ msgstr "برج مراقبة"
msgid "Information Office"
msgstr "مكتب إستعلامات"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "الخريطة"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15845,6 +16265,9 @@ msgstr "شارع"
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15884,6 +16307,9 @@ msgstr ""
msgid "Information Board"
msgstr "لوحة معلومات"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15905,22 +16331,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"
@@ -16050,49 +16488,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"
@@ -16110,6 +16542,12 @@ msgstr "كثليك"
msgid "evangelical"
msgstr "إنجيلي"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "شهود يهوه"
@@ -16122,6 +16560,9 @@ msgstr "منهجي"
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "أرثدكس"
@@ -16140,37 +16581,137 @@ 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"
@@ -16260,6 +16801,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 "صحة"
@@ -16341,71 +16888,155 @@ msgstr "بيطري"
msgid "Edit Veterinary"
msgstr "حرّر بيطري"
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
-msgstr "صندوق بريد"
-
-msgid "Telephone"
-msgstr "هاتف"
-
-msgid "Edit Telephone"
-msgstr "حرّر هاتف"
+msgid "Access rights"
+msgstr ""
-msgid "Telephone cards"
-msgstr "بطاقات هاتفية"
+msgid "public"
+msgstr ""
-msgid "Clock"
+msgid "seasonal"
msgstr ""
-msgid "Edit Clock"
+msgid "flush"
msgstr ""
-msgid "Display"
+msgid "pitlatrine"
msgstr ""
-msgctxt "display"
-msgid "analog"
+msgid "chemical"
msgstr ""
-msgctxt "display"
-msgid "digital"
+msgid "bucket"
msgstr ""
-msgctxt "display"
-msgid "sundial"
+msgid "Usage Position"
msgstr ""
-msgctxt "display"
-msgid "unorthodox"
+msgid "seated"
msgstr ""
-msgid "Support"
+msgid "seated;urinal"
msgstr ""
-msgid "wall_mounted"
+msgid "squat"
msgstr ""
-msgid "billboard"
+msgid "urinal"
msgstr ""
-msgid "Visibility/readability"
+msgid "Post Box"
+msgstr "صندوق بريد"
+
+msgid "Edit Postbox"
msgstr ""
-msgid "house (up to 5m)"
+msgid "Collection times"
msgstr ""
-msgid "street (up to 20m)"
+msgid "11:30"
msgstr ""
-msgid "area (more than 20m)"
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
msgstr ""
-msgid "Shows current date"
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
msgstr ""
-msgid "Shows temperature"
+msgid "Drive through"
+msgstr ""
+
+msgid "Telephone"
+msgstr "هاتف"
+
+msgid "Edit Telephone"
+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 ""
+
+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"
@@ -16417,8 +17048,8 @@ msgstr ""
msgid "Recycling"
msgstr "إعادة تصنيع الأشياء"
-msgid "Edit Recycling station"
-msgstr "حرّر إعادة تصنيع الأشياء"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "بطاريات"
@@ -16444,21 +17075,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 "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16493,8 +17118,17 @@ msgstr ""
msgid "Height"
msgstr "الإرتفاع"
+msgctxt "height"
msgid "low"
-msgstr "منخفض"
+msgstr ""
+
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
msgid "Hide"
msgstr "مخبئ"
@@ -16502,9 +17136,6 @@ msgstr "مخبئ"
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
-msgstr "ماء شفة"
-
msgid "Edit Source of Potable Water"
msgstr ""
@@ -16536,6 +17167,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16573,119 +17207,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 "مركز/نادي رياضي"
@@ -16717,26 +17387,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 ""
@@ -16744,6 +17415,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr "مركز/نادي رياضي"
+
+msgid "stadium"
+msgstr "مدرج ألعاب رياضية"
+
msgid "10pin"
msgstr ""
@@ -16777,6 +17457,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 "سباق الكلاب"
@@ -16833,7 +17529,7 @@ msgid "Skating"
msgstr "تزحلق"
msgid "Edit Skating"
-msgstr "حرّر تزحلق"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -16877,36 +17573,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 ""
@@ -16949,19 +17663,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 ""
@@ -17100,6 +17810,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 ""
@@ -17112,60 +17834,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 "برج"
@@ -17390,41 +18186,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"
@@ -17433,8 +18255,8 @@ msgstr "نقطة رؤية"
msgid "Edit Survey Point"
msgstr "حرّر نقطة رؤية"
-msgid "Surveillance"
-msgstr "مراقبة"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "حرّر كامرة مراقبة"
@@ -17445,12 +18267,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 "مولد طاقة"
@@ -17502,89 +18414,192 @@ 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 "battery charging"
+msgid "biofuel, biogas, diesel, gas, gasoline"
msgstr ""
-msgid "Power Station"
-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 "Edit Power Station"
-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 "محطة طاقة فرعية"
@@ -17595,6 +18610,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 ""
@@ -17610,6 +18640,9 @@ msgstr "حرّر عمود كهربائي"
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17628,11 +18661,9 @@ msgstr "حرّر عمود كهربائي"
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17741,11 +18772,11 @@ msgstr "كشك"
msgid "Edit Kiosk"
msgstr "حرّر كشك"
-msgid "Baker"
-msgstr "خباز"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "حرّر خباز"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "جزار"
@@ -17756,7 +18787,7 @@ msgstr "حرّر جزار"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17777,6 +18808,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr "مأكولات عضوية"
+
msgid "Greengrocer"
msgstr ""
@@ -17789,9 +18823,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr "مأكولات عضوية"
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17861,7 +18892,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17882,13 +18913,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"
@@ -17897,9 +18928,8 @@ msgstr "Hifi"
msgid "Edit Hifi Shop"
msgstr "حرّر مبيع Hifi"
-msgctxt "shop"
msgid "Video"
-msgstr ""
+msgstr "مرئيّات"
msgid "Edit Video Shop"
msgstr "حرّر مبيع مرئيّات"
@@ -17925,6 +18955,12 @@ msgstr "حرّر صرّاف"
msgid "Edit Automated Teller Machine"
msgstr "حرّر صراف آلي"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17961,10 +18997,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"
@@ -17994,7 +19051,7 @@ msgstr "حرّر مخزن خردوات/أدوات منزلية"
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18006,19 +19063,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"
@@ -18054,7 +19111,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18267,6 +19324,12 @@ msgstr "قمّة"
msgid "Edit Peak"
msgstr "حرّر قمّة"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "جليد"
@@ -18306,26 +19369,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 "غابة"
@@ -18333,15 +19405,6 @@ msgstr "غابة"
msgid "Edit Forest Landuse"
msgstr "حرّر غابة"
-msgid "coniferous"
-msgstr "صنوبري الثمر"
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr "مختلط"
-
msgid "Grassland"
msgstr ""
@@ -18417,6 +19480,12 @@ msgstr "مرج"
msgid "Edit Meadow Landuse"
msgstr "حرّر مرج"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "كرم عنب"
@@ -18471,8 +19540,8 @@ msgstr "ميدان ألعاب"
msgid "Edit Recreation Ground Landuse"
msgstr "حرّر ميدان ألعاب"
-msgid "Residential area"
-msgstr "منطقة سكنية"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "حرّر منطقة سكنية"
@@ -18483,6 +19552,9 @@ msgstr "مقبرة"
msgid "Edit Graveyard"
msgstr "حرّر مقبرة"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "مقبرة"
@@ -18543,19 +19615,46 @@ msgstr "حقل أخضر"
msgid "Edit Greenfield Landuse"
msgstr "حرّر إستعمال الأرض كحقل أخضر"
-msgid "Landfill"
-msgstr "مطمر نفايات"
+msgid "Landfill"
+msgstr "مطمر نفايات"
+
+msgid "Edit Landfill Landuse"
+msgstr "حرّر مطمر نفايات"
+
+msgid "Quarry"
+msgstr "كسّارة، مقلع حجارة"
+
+msgid "Edit Quarry Landuse"
+msgstr "حرّر كسّارة / مقلع حجارة"
+
+msgid "Annotation"
+msgstr ""
+
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
-msgid "Edit Landfill Landuse"
-msgstr "حرّر مطمر نفايات"
+msgid "Regional name"
+msgstr ""
-msgid "Quarry"
-msgstr "كسّارة، مقلع حجارة"
+msgid "National name"
+msgstr ""
-msgid "Edit Quarry Landuse"
-msgstr "حرّر كسّارة / مقلع حجارة"
+msgid "International name"
+msgstr ""
-msgid "Annotation"
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18594,6 +19693,18 @@ msgstr "مثنى"
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18762,21 +19873,50 @@ msgstr ""
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 ""
+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 "وصف الرمز"
@@ -18822,19 +19962,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"
@@ -18858,7 +20001,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18954,18 +20097,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 "خيل"
@@ -18975,7 +20127,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18984,10 +20139,10 @@ msgstr ""
msgid "ford"
msgstr "مخاضة"
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -19005,6 +20160,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19020,28 +20178,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"
@@ -19062,20 +20220,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 "فندق"
@@ -19149,10 +20307,13 @@ msgstr "طريق"
msgid "boundary"
msgstr "الحدود"
+msgid "sport"
+msgstr "الرياضة"
+
msgid "place"
msgstr "المكان"
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19167,9 +20328,6 @@ msgstr "القرية/المدينة"
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr "كنيسة"
-
msgid "Fuel Station"
msgstr "محطة محروقات"
@@ -19197,6 +20355,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19242,10 +20403,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"
@@ -19257,7 +20448,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"
@@ -19275,7 +20466,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19392,19 +20583,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 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"
@@ -19423,7 +20725,46 @@ 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 "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 "Landsat"
@@ -19435,19 +20776,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 "skobbler heatmap"
@@ -19468,7 +20818,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19477,6 +20827,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19623,6 +20976,29 @@ 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 ""
@@ -19788,6 +21164,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19833,6 +21212,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -20019,19 +21431,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20055,13 +21479,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20324,10 +21742,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20531,7 +21952,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"
@@ -20802,15 +22223,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20981,6 +22393,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 ""
@@ -20999,12 +22414,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21140,6 +22549,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 ""
@@ -21157,6 +22569,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 ""
@@ -21383,7 +22798,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."
@@ -21433,7 +22851,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21618,6 +23036,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21657,27 +23140,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 ""
@@ -22755,9 +24220,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 ""
@@ -23404,9 +24886,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "وقع خطأ: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23459,18 +24938,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 ""
@@ -23817,6 +25284,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23968,6 +25456,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 ""
@@ -24285,9 +25776,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24503,6 +25991,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 ""
@@ -24535,15 +26026,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 ""
@@ -24658,9 +26165,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24839,19 +26343,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"
@@ -25067,6 +26571,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 ""
@@ -25103,6 +26696,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..."
@@ -25255,9 +26851,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26243,9 +27836,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr "مرئيّات"
-
msgid "Import Video"
msgstr ""
@@ -26524,9 +28114,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 c2a0d0c..0e1e990 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-08-04 03:41+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-08-05 04:33+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ 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 ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Executando l'enganche d'aniciu de la plataforma"
@@ -162,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 "
@@ -263,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"
@@ -302,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}"
@@ -358,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"
@@ -548,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)"
@@ -674,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"
@@ -837,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"
@@ -1037,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 "
@@ -1065,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>"
@@ -1249,9 +1237,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1400,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"
@@ -1499,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"
@@ -1783,6 +1785,9 @@ 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})"
@@ -2012,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] ""
@@ -2457,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 ""
@@ -2653,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 ""
@@ -2744,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}"
@@ -2780,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"
@@ -2806,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}''"
@@ -2911,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"
@@ -2971,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"
@@ -3002,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"
@@ -3026,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 ""
@@ -3056,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 ""
@@ -3076,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 ""
@@ -3085,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 ""
@@ -3105,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}"
@@ -3136,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}''."
@@ -3292,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 ""
@@ -3400,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 ""
@@ -3438,9 +3450,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3479,6 +3488,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3503,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 ""
@@ -3562,6 +3583,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3644,6 +3668,15 @@ 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 ""
@@ -3713,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 ""
@@ -3770,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})"
@@ -3808,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}"
@@ -3945,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"
@@ -4020,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 ""
@@ -4050,9 +4092,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -4077,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''"
@@ -4143,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 ""
@@ -4263,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"
@@ -4492,6 +4514,18 @@ 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 ""
@@ -4596,19 +4630,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 ""
@@ -4896,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"
@@ -4933,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"
@@ -4985,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 ""
@@ -5242,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 ""
@@ -5770,6 +5801,9 @@ msgstr "Amuesa / Escuende"
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5853,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 ""
@@ -5943,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 ""
@@ -6114,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 ""
@@ -6401,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"
@@ -6467,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"
@@ -6509,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)"
@@ -6669,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"
@@ -6987,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"
@@ -7118,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, "
@@ -7145,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 ""
@@ -7263,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."
@@ -7362,6 +7421,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7449,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"
@@ -7468,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 ""
@@ -7534,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"
@@ -7610,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 ""
@@ -7625,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"
@@ -7841,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 "
@@ -7855,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 ""
@@ -7870,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 ""
@@ -7877,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 ..."
@@ -7990,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] ""
@@ -8002,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>"
@@ -8018,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:"
@@ -8164,7 +8255,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8194,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"
@@ -8549,9 +8640,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8570,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"
@@ -8627,6 +8718,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8693,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 ""
@@ -8876,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}''..."
@@ -8898,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"
@@ -8908,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:"
@@ -9129,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}''"
@@ -9844,6 +9933,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9912,6 +10034,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9965,6 +10090,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 ""
@@ -10421,6 +10551,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 ""
@@ -10484,7 +10620,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 ""
@@ -10742,40 +10878,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}''"
@@ -10828,8 +10964,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:"
@@ -10838,20 +10974,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 ""
@@ -10933,14 +11074,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"
@@ -11013,7 +11148,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -11092,9 +11227,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -11113,6 +11245,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 ""
@@ -11142,9 +11282,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 ""
@@ -11175,7 +11355,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 ""
@@ -11215,28 +11395,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..."
@@ -11331,6 +11509,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11346,12 +11527,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}."
@@ -11430,7 +11619,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11529,35 +11718,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 ""
@@ -11567,8 +11732,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 ..."
@@ -11595,10 +11760,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>"
@@ -11682,8 +11844,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}."
@@ -11880,7 +12042,7 @@ 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}"
@@ -11926,6 +12088,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."
@@ -11956,19 +12127,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 ""
@@ -11990,11 +12161,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 ""
@@ -12064,13 +12247,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}''"
@@ -12213,10 +12396,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"
@@ -12231,22 +12414,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}''"
@@ -12317,8 +12499,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..."
@@ -12333,9 +12514,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}''"
@@ -12657,12 +12853,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12673,16 +12868,59 @@ 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 "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 ""
+
+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 ""
@@ -12707,9 +12945,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."
@@ -13032,6 +13284,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 ""
@@ -13271,6 +13528,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."
@@ -13320,9 +13580,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 ""
@@ -13359,6 +13616,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 ""
@@ -13489,6 +13751,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13579,6 +13844,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 ""
@@ -13597,10 +13906,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13612,6 +13921,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13639,18 +13951,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 ""
@@ -13660,9 +13966,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13672,13 +13975,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13726,6 +14029,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13810,6 +14116,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13914,21 +14223,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 ""
@@ -13944,10 +14262,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"
@@ -13983,7 +14301,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -14052,12 +14370,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 ""
@@ -14073,15 +14397,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 ""
@@ -14103,6 +14418,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -14112,6 +14436,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -14121,10 +14448,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14157,9 +14481,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14199,7 +14520,19 @@ msgstr ""
msgid "Edit Block"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
msgstr ""
msgid "Bollard"
@@ -14217,6 +14550,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14286,19 +14622,16 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
-msgstr ""
-
-msgid "split_rail"
+msgid "pole"
msgstr ""
-msgid "chain"
+msgid "Guard Rail"
msgstr ""
-msgid "hedge"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14329,6 +14662,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14338,10 +14672,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14395,12 +14729,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14461,12 +14789,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14506,9 +14843,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14542,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 ""
@@ -14623,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 ""
@@ -14710,7 +15064,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14734,10 +15088,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"
@@ -14749,9 +15106,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14803,6 +15157,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14815,6 +15172,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14926,11 +15318,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14942,11 +15332,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14965,10 +15353,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14998,9 +15386,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -15022,10 +15407,29 @@ 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"
@@ -15175,6 +15579,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15196,6 +15603,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15223,6 +15636,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15247,22 +15666,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 ""
@@ -15284,9 +15687,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15481,6 +15881,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15511,6 +15914,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15523,9 +15929,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15535,9 +15938,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15550,6 +15958,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15574,14 +15985,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15630,7 +16033,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15684,41 +16087,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"
@@ -15910,9 +16313,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15934,9 +16334,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15949,6 +16355,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15988,6 +16397,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -16009,22 +16421,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"
@@ -16154,49 +16578,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"
@@ -16214,6 +16632,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16226,6 +16650,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16244,37 +16671,137 @@ 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"
@@ -16364,6 +16891,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 ""
@@ -16445,122 +16978,200 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
msgstr ""
msgid "Amount of Seats"
@@ -16597,16 +17208,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16640,6 +17257,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16677,117 +17297,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 ""
@@ -16821,33 +17477,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 ""
@@ -16881,6 +17547,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 ""
@@ -16981,36 +17663,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 ""
@@ -17053,19 +17753,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 ""
@@ -17204,6 +17900,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 ""
@@ -17216,60 +17924,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 ""
@@ -17494,41 +18276,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"
@@ -17537,7 +18345,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17549,12 +18357,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 ""
@@ -17606,88 +18504,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"
+msgid "biomass / waste"
msgstr ""
-msgid "pumped-storage"
-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 "battery charging"
+msgid "stellarator"
msgstr ""
-msgid "Power Station"
+msgid "nuclear fusion"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17699,6 +18700,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 ""
@@ -17714,6 +18730,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17732,11 +18751,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17845,10 +18862,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17860,7 +18877,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17881,6 +18898,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17893,9 +18913,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17965,7 +18982,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17986,13 +19003,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"
@@ -18001,7 +19018,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -18029,6 +19045,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -18065,10 +19087,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"
@@ -18098,7 +19141,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18110,19 +19153,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"
@@ -18158,7 +19201,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18371,6 +19414,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18410,24 +19459,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 ""
@@ -18437,15 +19495,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18521,6 +19570,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18575,7 +19630,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18584,7 +19639,10 @@ msgstr ""
msgid "Graveyard"
msgstr ""
-msgid "Edit Graveyard"
+msgid "Edit Graveyard"
+msgstr ""
+
+msgid "shinto"
msgstr ""
msgid "Cemetery"
@@ -18662,6 +19720,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 ""
@@ -18698,6 +19783,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18866,21 +19963,50 @@ 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 ""
+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 ""
@@ -18926,19 +20052,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"
@@ -18962,7 +20091,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -19058,18 +20187,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 ""
@@ -19079,7 +20217,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -19088,10 +20229,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -19109,6 +20250,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19124,28 +20268,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"
@@ -19166,19 +20310,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"
@@ -19253,10 +20397,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19271,9 +20418,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19301,6 +20445,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19346,10 +20493,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"
@@ -19361,7 +20538,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"
@@ -19379,7 +20556,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19496,19 +20673,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 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"
@@ -19527,7 +20815,46 @@ 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 "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 "Landsat"
@@ -19539,19 +20866,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 "skobbler heatmap"
@@ -19572,7 +20908,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19581,6 +20917,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19727,6 +21066,29 @@ 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 ""
@@ -19892,6 +21254,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19937,6 +21302,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -20132,10 +21530,22 @@ msgstr ""
msgid "Uploads traces to openstreetmap.org"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
+msgstr ""
+
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20159,13 +21569,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20428,10 +21832,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20635,7 +22042,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"
@@ -20906,15 +22313,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -21085,6 +22483,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 ""
@@ -21103,12 +22504,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21244,6 +22639,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 ""
@@ -21261,6 +22659,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 ""
@@ -21487,7 +22888,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."
@@ -21537,7 +22941,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21722,6 +23126,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21761,27 +23230,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 ""
@@ -22859,9 +24310,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 ""
@@ -23508,9 +24980,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Hubo un error: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23563,18 +25032,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 ""
@@ -23921,6 +25378,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -24072,6 +25550,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 ""
@@ -24389,9 +25870,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24607,6 +26085,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 ""
@@ -24639,15 +26120,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 ""
@@ -24762,9 +26259,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24943,19 +26437,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"
@@ -25171,6 +26665,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 ""
@@ -25207,6 +26790,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..."
@@ -25359,9 +26945,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26347,9 +27930,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26628,9 +28208,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 7338e16..1d10c0a 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-08-04 03:41+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-08-05 04:34+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -58,6 +61,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -158,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 ""
@@ -249,9 +255,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -288,6 +291,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -342,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 ""
@@ -522,6 +528,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -635,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 ""
@@ -785,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"
@@ -971,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 ""
@@ -994,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>"
@@ -1162,9 +1164,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1303,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"
@@ -1398,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 ""
@@ -1682,6 +1702,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1901,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] ""
@@ -2327,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 ""
@@ -2523,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 ""
@@ -2610,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 ""
@@ -2646,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"
@@ -2672,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}''"
@@ -2777,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] ""
@@ -2837,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"
@@ -2868,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"
@@ -2892,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 ""
@@ -2922,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 ""
@@ -2942,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 ""
@@ -2951,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 ""
@@ -2971,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}"
@@ -3002,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}''."
@@ -3159,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 ""
@@ -3267,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 ""
@@ -3305,9 +3335,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3346,6 +3373,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3370,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 ""
@@ -3429,6 +3468,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3511,6 +3553,15 @@ 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 ""
@@ -3580,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 ""
@@ -3637,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})"
@@ -3675,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}"
@@ -3812,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"
@@ -3887,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 ""
@@ -3917,9 +3977,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3944,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''"
@@ -4010,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 ""
@@ -4130,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"
@@ -4359,6 +4399,18 @@ 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 ""
@@ -4463,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 ""
@@ -4763,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 "> 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"
@@ -4800,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"
@@ -4852,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 ""
@@ -5109,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 ""
@@ -5637,6 +5686,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5720,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 ""
@@ -5810,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 ""
@@ -5981,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 ""
@@ -6268,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"
@@ -6334,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"
@@ -6376,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)"
@@ -6536,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"
@@ -6854,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 ""
@@ -6985,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 ""
@@ -7009,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 ""
@@ -7122,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."
@@ -7221,6 +7300,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7308,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"
@@ -7327,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 ""
@@ -7393,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"
@@ -7469,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 ""
@@ -7484,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"
@@ -7700,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 "
@@ -7714,13 +7794,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7729,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 ""
@@ -7736,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 ..."
@@ -7849,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] ""
@@ -7861,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>"
@@ -7877,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:"
@@ -8023,7 +8134,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8053,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"
@@ -8406,9 +8517,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8427,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 ""
@@ -8484,6 +8595,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8550,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 ""
@@ -8733,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}''..."
@@ -8755,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"
@@ -8765,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:"
@@ -8986,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}''"
@@ -9701,6 +9810,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9769,6 +9911,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9822,6 +9967,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 ""
@@ -10278,6 +10428,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 ""
@@ -10341,7 +10497,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 ""
@@ -10599,40 +10755,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}''"
@@ -10685,8 +10841,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:"
@@ -10695,20 +10851,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 ""
@@ -10790,14 +10951,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"
@@ -10870,7 +11025,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10949,9 +11104,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10970,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 ""
@@ -10999,9 +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 ""
@@ -11032,7 +11232,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 ""
@@ -11072,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..."
@@ -11188,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 ""
@@ -11203,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}."
@@ -11287,7 +11496,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11386,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 ""
@@ -11424,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 ..."
@@ -11452,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>"
@@ -11539,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}."
@@ -11737,7 +11919,7 @@ 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}"
@@ -11783,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."
@@ -11813,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 ""
@@ -11847,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 ""
@@ -11921,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}''"
@@ -12070,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"
@@ -12088,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}''"
@@ -12172,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..."
@@ -12188,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}''"
@@ -12512,12 +12728,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12528,30 +12743,73 @@ 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 "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] ""
+
+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"
@@ -12562,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."
@@ -12887,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 ""
@@ -13126,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."
@@ -13175,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 ""
@@ -13214,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 ""
@@ -13344,6 +13626,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13434,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 ""
@@ -13452,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"
@@ -13467,6 +13796,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13494,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 ""
@@ -13515,9 +13841,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13527,13 +13850,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13581,6 +13904,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13665,6 +13991,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13769,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 ""
@@ -13799,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"
@@ -13838,7 +14176,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13907,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 ""
@@ -13928,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 ""
@@ -13958,6 +14293,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13967,6 +14311,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13976,10 +14323,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14012,9 +14356,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14057,6 +14398,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14072,6 +14419,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14141,19 +14491,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14184,6 +14528,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14193,10 +14538,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14250,12 +14595,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14316,12 +14655,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14361,9 +14709,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14397,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 ""
@@ -14478,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 ""
@@ -14565,7 +14930,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14589,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"
@@ -14604,9 +14972,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14658,6 +15023,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14670,6 +15038,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14781,11 +15184,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14797,11 +15198,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14820,10 +15219,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14853,9 +15252,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14877,10 +15273,29 @@ 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"
@@ -15030,6 +15445,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15051,6 +15469,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15078,6 +15502,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15102,22 +15532,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 ""
@@ -15139,9 +15553,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15336,6 +15747,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15366,6 +15780,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15378,9 +15795,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15390,9 +15804,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15405,6 +15824,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15429,14 +15851,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15485,7 +15899,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15539,41 +15953,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"
@@ -15765,9 +16179,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15789,9 +16200,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15804,6 +16221,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15843,6 +16263,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15864,22 +16287,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"
@@ -16009,49 +16444,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"
@@ -16069,6 +16498,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16081,6 +16516,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16099,37 +16537,137 @@ 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"
@@ -16219,6 +16757,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 ""
@@ -16300,128 +16844,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16452,16 +17074,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16495,6 +17123,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16532,117 +17163,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 ""
@@ -16676,33 +17343,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 ""
@@ -16736,6 +17413,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 ""
@@ -16836,36 +17529,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 ""
@@ -16908,19 +17619,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 ""
@@ -17059,6 +17766,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 ""
@@ -17071,60 +17790,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 ""
@@ -17349,41 +18142,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"
@@ -17392,7 +18211,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17404,12 +18223,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 ""
@@ -17461,88 +18370,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17554,6 +18566,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 ""
@@ -17569,6 +18596,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17587,11 +18617,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17700,10 +18728,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17715,7 +18743,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17736,6 +18764,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17748,9 +18779,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17820,7 +18848,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17841,13 +18869,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"
@@ -17856,7 +18884,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17884,6 +18911,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17920,10 +18953,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"
@@ -17953,7 +19007,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17965,19 +19019,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"
@@ -18013,7 +19067,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18226,6 +19280,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18265,24 +19325,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 ""
@@ -18292,15 +19361,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18376,6 +19436,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18430,7 +19496,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18442,6 +19508,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18478,43 +19547,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18553,6 +19649,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18721,21 +19829,50 @@ 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 ""
+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 ""
@@ -18781,19 +19918,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"
@@ -18817,7 +19957,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18913,18 +20053,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 ""
@@ -18934,7 +20083,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18943,10 +20095,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18964,6 +20116,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18979,28 +20134,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"
@@ -19021,19 +20176,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"
@@ -19108,10 +20263,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19126,9 +20284,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19156,6 +20311,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19201,10 +20359,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"
@@ -19216,7 +20404,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"
@@ -19234,7 +20422,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19351,19 +20539,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 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"
@@ -19382,7 +20681,46 @@ 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 "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 "Landsat"
@@ -19394,19 +20732,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 "skobbler heatmap"
@@ -19427,7 +20774,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19436,6 +20783,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19582,6 +20932,29 @@ 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 ""
@@ -19747,6 +21120,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19792,6 +21168,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19978,19 +21387,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20014,13 +21435,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20283,10 +21698,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20490,7 +21908,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"
@@ -20761,15 +22179,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20940,6 +22349,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 ""
@@ -20958,12 +22370,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21099,6 +22505,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 ""
@@ -21116,6 +22525,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 ""
@@ -21342,7 +22754,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."
@@ -21392,7 +22807,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21577,6 +22992,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21616,27 +23096,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 ""
@@ -22714,9 +24176,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 ""
@@ -23363,9 +24842,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23418,18 +24894,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 ""
@@ -23776,6 +25240,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23927,6 +25412,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 ""
@@ -24244,9 +25732,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24462,6 +25947,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 ""
@@ -24494,15 +25982,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 ""
@@ -24617,9 +26121,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24798,19 +26299,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"
@@ -25026,6 +26527,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 ""
@@ -25062,6 +26652,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..."
@@ -25214,9 +26807,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26202,9 +27792,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26483,9 +28070,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 f14fcb4..220aeac 100644
--- a/i18n/po/be.po
+++ b/i18n/po/be.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-04 03:41+0200\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"
@@ -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-08-05 04:35+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr "Умовы выкарыстання падкладкі"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "Пераход па спасылцы не падтрымліваецца на гэтай платформе ('' {0}'')"
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr "ПАПЯРЭДЖАНЬНЕ: {0}"
@@ -60,6 +63,9 @@ msgstr "ІНФАРМАЦЫЯ: {0}"
msgid "DEBUG: {0}"
msgstr "Адладка: {0}"
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Выкананне стартавых працэдур"
@@ -164,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 "
@@ -262,9 +266,6 @@ msgstr "Інструмент: {0}"
msgid "Please select at least four nodes."
msgstr "Выбераце як-меней чатыры ноды."
-msgid "Information"
-msgstr "Інфармацыя"
-
msgid "Align Nodes in Line"
msgstr "Размеркаваць ноды ўздоуж лініі"
@@ -301,6 +302,9 @@ msgstr "далей/наступнае"
msgid "Nothing selected to zoom to."
msgstr "Нічога не выбрана для прагляду"
+msgid "Information"
+msgstr "Інфармацыя"
+
msgid "Zoom to {0}"
msgstr "Праглядзець {0}"
@@ -356,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 ""
@@ -545,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)"
@@ -667,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 "Вырашыць канфлікты з меткамі"
@@ -833,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"
@@ -1036,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 "
@@ -1062,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>"
@@ -1245,9 +1242,6 @@ msgstr "Запампаваць сесію"
msgid "Load a session from file."
msgstr "Запампаваць сесію з файла"
-msgid "Session file (*.jos, *.joz)"
-msgstr "Файл сессіі (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Адкрыць сессію"
@@ -1403,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} кавалкаў"
@@ -1515,6 +1505,27 @@ 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 "Вярнуць"
@@ -1806,6 +1817,9 @@ 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} засталося)"
@@ -2054,11 +2068,10 @@ 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"
-msgstr[0] "Дадаць новую кропку да лініі"
-msgstr[1] "Дадаць новую кропку да {0} ліній"
-msgstr[2] "Дадаць новую кропку да {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 "Немагчыма выдаліць кропку, што ўваходзіць у некалькі аб'ектаў"
@@ -2523,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 ""
@@ -2719,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 ""
@@ -2806,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 ""
@@ -2842,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"
@@ -2868,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}''"
@@ -2973,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] ""
@@ -3033,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"
@@ -3064,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"
@@ -3088,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 ""
@@ -3118,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 ""
@@ -3138,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 ""
@@ -3147,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 ""
@@ -3167,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}"
@@ -3198,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}''."
@@ -3355,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 ""
@@ -3463,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 ""
@@ -3501,9 +3521,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3542,6 +3559,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3566,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 ""
@@ -3625,6 +3654,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3707,6 +3739,15 @@ 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 ""
@@ -3776,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 ""
@@ -3833,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})"
@@ -3871,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}"
@@ -4008,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"
@@ -4083,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 ""
@@ -4113,9 +4163,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -4140,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''"
@@ -4206,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 ""
@@ -4326,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"
@@ -4555,6 +4585,18 @@ 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 ""
@@ -4659,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 ""
@@ -4959,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"
@@ -4996,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"
@@ -5048,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 ""
@@ -5305,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 ""
@@ -5833,6 +5872,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5916,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 ""
@@ -6006,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 ""
@@ -6177,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 ""
@@ -6464,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"
@@ -6530,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"
@@ -6572,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)"
@@ -6732,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"
@@ -7050,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 ""
@@ -7181,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, "
@@ -7207,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 ""
@@ -7325,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."
@@ -7424,6 +7491,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7511,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"
@@ -7530,13 +7600,19 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
-msgid "Changeset id:"
+msgid "Specify the data source for the changes:"
msgstr ""
-msgid "Created at:"
+msgid "Enter a source"
msgstr ""
-msgid "Changeset comment:"
+msgid "Changeset id:"
+msgstr ""
+
+msgid "Created at:"
+msgstr ""
+
+msgid "Changeset comment:"
msgstr ""
msgid "No open changeset"
@@ -7596,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"
@@ -7672,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 ""
@@ -7687,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"
@@ -7903,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 "
@@ -7917,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 ""
@@ -7932,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 ""
@@ -7939,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 ..."
@@ -8052,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] ""
@@ -8064,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>"
@@ -8080,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:"
@@ -8226,7 +8325,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8256,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"
@@ -8611,9 +8710,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8632,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 ""
@@ -8689,6 +8788,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8755,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 ""
@@ -8938,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}''..."
@@ -8960,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"
@@ -8970,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:"
@@ -9191,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}''"
@@ -9906,7 +10003,7 @@ msgstr ""
msgid "Advanced Background: Changed"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid "Advanced Background: NonDefault"
msgstr ""
msgid "Current value is default."
@@ -9974,6 +10071,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -10027,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 ""
@@ -10483,6 +10588,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 ""
@@ -10546,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 ""
@@ -10804,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}''"
@@ -10890,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:"
@@ -10900,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 "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 ""
@@ -10995,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"
@@ -11052,6 +11162,12 @@ msgstr ""
msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
+msgid "Paste tags from buffer"
+msgstr ""
+
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr ""
+
msgid "Use preset ''{0}''"
msgstr ""
@@ -11075,7 +11191,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -11154,9 +11270,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -11175,6 +11288,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 ""
@@ -11204,9 +11325,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 +11398,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 ""
@@ -11277,28 +11438,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..."
@@ -11393,6 +11552,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11408,12 +11570,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}."
@@ -11492,7 +11662,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11591,35 +11761,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 ""
@@ -11629,8 +11775,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 ..."
@@ -11657,10 +11803,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>"
@@ -11744,8 +11887,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}."
@@ -11942,7 +12085,7 @@ 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}"
@@ -11988,6 +12131,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."
@@ -12018,19 +12170,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 ""
@@ -12052,11 +12204,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 ""
@@ -12126,13 +12290,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}''"
@@ -12275,10 +12439,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"
@@ -12293,22 +12457,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}''"
@@ -12377,8 +12540,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..."
@@ -12393,9 +12555,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}''"
@@ -12717,12 +12894,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12733,56 +12909,113 @@ 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 ""
-"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 ""
-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 ""
+
+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 ""
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
+"{2}. Cannot restore window geometry from preferences."
+msgstr ""
+
+msgid ""
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"{2}. Cannot restore window geometry from preferences."
msgstr ""
msgid ""
@@ -13092,6 +13325,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 ""
@@ -13331,6 +13569,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."
@@ -13380,9 +13621,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 ""
@@ -13419,6 +13657,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 ""
@@ -13549,6 +13792,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13639,6 +13885,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 ""
@@ -13657,10 +13947,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13672,6 +13962,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13699,18 +13992,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 ""
@@ -13720,9 +14007,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13732,13 +14016,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13786,6 +14070,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13870,6 +14157,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13974,21 +14264,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 ""
@@ -14004,10 +14303,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"
@@ -14043,7 +14342,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -14112,12 +14411,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 ""
@@ -14133,15 +14438,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 ""
@@ -14163,6 +14459,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -14172,6 +14477,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -14181,10 +14489,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14217,9 +14522,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14262,6 +14564,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14277,6 +14585,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14346,19 +14657,16 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
-msgstr ""
-
-msgid "split_rail"
+msgid "pole"
msgstr ""
-msgid "chain"
+msgid "Guard Rail"
msgstr ""
-msgid "hedge"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14389,6 +14697,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14398,10 +14707,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14455,12 +14764,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14521,12 +14824,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14566,9 +14878,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14602,6 +14911,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 ""
@@ -14683,18 +15007,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 ""
@@ -14770,7 +15099,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14794,10 +15123,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"
@@ -14809,9 +15141,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14863,6 +15192,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14875,18 +15207,32 @@ 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 ""
@@ -14986,11 +15332,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -15002,11 +15346,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -15025,10 +15367,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -15058,9 +15400,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Ёмістасць"
@@ -15082,10 +15421,29 @@ 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"
@@ -15235,6 +15593,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15256,6 +15617,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15283,6 +15650,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15307,22 +15680,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 ""
@@ -15344,9 +15701,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15541,6 +15895,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15571,6 +15928,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15583,9 +15943,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15595,9 +15952,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15610,6 +15972,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15634,14 +15999,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15690,7 +16047,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15744,41 +16101,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"
@@ -15970,9 +16327,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15994,9 +16348,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -16009,6 +16369,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -16048,6 +16411,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -16069,22 +16435,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"
@@ -16214,49 +16592,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"
@@ -16274,6 +16646,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16286,6 +16664,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16304,37 +16685,137 @@ 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"
@@ -16424,6 +16905,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 ""
@@ -16505,12 +16992,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+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 ""
@@ -16520,6 +17061,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 ""
@@ -16529,31 +17094,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 ""
@@ -16581,7 +17152,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16608,21 +17179,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 "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16657,18 +17222,24 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
+
msgid "Hide"
msgstr "Схаваць"
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
-msgstr ""
-
msgid "Edit Source of Potable Water"
msgstr ""
@@ -16700,6 +17271,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16737,117 +17311,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 ""
@@ -16881,33 +17491,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 ""
@@ -16941,6 +17561,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 ""
@@ -17041,36 +17677,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 ""
@@ -17113,19 +17767,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 ""
@@ -17264,6 +17914,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 ""
@@ -17276,58 +17938,132 @@ 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"
+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 ""
-msgid "apartments"
+msgctxt "entrance"
+msgid "yes"
msgstr ""
-msgid "house"
+msgctxt "entrance"
+msgid "main"
msgstr ""
-msgid "hut"
+msgctxt "entrance"
+msgid "service"
msgstr ""
-msgid "terrace"
+msgctxt "entrance"
+msgid "exit"
msgstr ""
-msgid "detached"
+msgctxt "entrance"
+msgid "emergency"
msgstr ""
msgid "Tower"
@@ -17554,41 +18290,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"
@@ -17597,7 +18359,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17609,12 +18371,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 ""
@@ -17666,88 +18518,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 "battery charging"
+msgid "hygro run-of-the-river / hydro water-storage"
msgstr ""
-msgid "Power Station"
+msgid "reciprocating_engine"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17759,6 +18714,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 ""
@@ -17774,6 +18744,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17792,11 +18765,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17905,10 +18876,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17920,7 +18891,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17941,6 +18912,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17953,9 +18927,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -18025,7 +18996,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -18046,13 +19017,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"
@@ -18061,7 +19032,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -18089,6 +19059,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -18125,10 +19101,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"
@@ -18158,7 +19155,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18170,19 +19167,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"
@@ -18218,7 +19215,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18431,6 +19428,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18470,24 +19473,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 ""
@@ -18497,15 +19509,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18581,6 +19584,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18635,7 +19644,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18644,7 +19653,10 @@ msgstr ""
msgid "Graveyard"
msgstr ""
-msgid "Edit Graveyard"
+msgid "Edit Graveyard"
+msgstr ""
+
+msgid "shinto"
msgstr ""
msgid "Cemetery"
@@ -18722,6 +19734,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 ""
@@ -18758,6 +19797,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18926,21 +19977,50 @@ 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 ""
+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 ""
@@ -18986,19 +20066,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"
@@ -19022,7 +20105,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -19118,18 +20201,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 ""
@@ -19139,7 +20231,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -19148,10 +20243,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -19169,6 +20264,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19184,28 +20282,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"
@@ -19226,19 +20324,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"
@@ -19313,10 +20411,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19331,9 +20432,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19361,6 +20459,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19406,10 +20507,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"
@@ -19421,7 +20552,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"
@@ -19439,7 +20570,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19556,19 +20687,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 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"
@@ -19587,7 +20829,46 @@ 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 "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 "Landsat"
@@ -19599,19 +20880,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 "skobbler heatmap"
@@ -19632,7 +20922,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19641,6 +20931,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19787,6 +21080,29 @@ 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 ""
@@ -19952,6 +21268,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19997,6 +21316,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -20192,10 +21544,22 @@ msgstr ""
msgid "Uploads traces to openstreetmap.org"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
+msgstr ""
+
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20219,13 +21583,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20488,10 +21846,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20695,7 +22056,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"
@@ -20966,15 +22327,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -21145,6 +22497,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 ""
@@ -21163,12 +22518,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21304,6 +22653,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 ""
@@ -21321,6 +22673,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 ""
@@ -21547,7 +22902,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."
@@ -21597,7 +22955,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21782,6 +23140,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21821,27 +23244,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 ""
@@ -22919,9 +24324,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 ""
@@ -23568,9 +24994,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23623,18 +25046,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 ""
@@ -23981,6 +25392,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -24132,6 +25564,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 ""
@@ -24449,9 +25884,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24667,6 +26099,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 ""
@@ -24699,15 +26134,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 ""
@@ -24822,9 +26273,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -25003,19 +26451,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"
@@ -25231,6 +26679,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 ""
@@ -25267,6 +26804,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..."
@@ -25419,9 +26959,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26407,9 +27944,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26688,9 +28222,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 6743cbc..ca2b33c 100644
--- a/i18n/po/bg.po
+++ b/i18n/po/bg.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-04 03:41+0200\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"
@@ -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-08-05 04:37+0000\n"
-"X-Generator: Launchpad (build 16718)\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"
@@ -51,6 +51,9 @@ msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
"Отварянето на връзката не се поддържа на текущата платформа (''{0}'')"
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr "ПРЕДУПРЕЖДЕНИЕ: {0}"
@@ -60,6 +63,9 @@ msgstr "ИНФО: {0}"
msgid "DEBUG: {0}"
msgstr "DEBUG: {0}"
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -164,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 ""
-"ВНИМАНИЕ: неочакван формат на базовия API адрес. Пренасочването към личната "
-"страница на OSM-потребителя невъзможно. Базовият API адрес: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -261,9 +265,6 @@ msgstr "Инструмент: {0}"
msgid "Please select at least four nodes."
msgstr "Моля изберете поне четири точки."
-msgid "Information"
-msgstr "Информация"
-
msgid "Align Nodes in Line"
msgstr "Подреди точките в линия"
@@ -300,6 +301,9 @@ msgstr "следващ"
msgid "Nothing selected to zoom to."
msgstr "Няма нищо избрано за показване."
+msgid "Information"
+msgstr "Информация"
+
msgid "Zoom to {0}"
msgstr "Показване на {0}"
@@ -356,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} линии"
@@ -544,6 +546,9 @@ msgstr "История"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Показва информация за историята на OSM линии, точки или релации."
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr "История (уеб)"
@@ -666,11 +671,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 "Поправяне конфликти маркери"
@@ -834,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 ""
"Моля изберете поне два възела за обединяване или възел, който е близък до "
"друг възел."
@@ -1025,16 +1028,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 "
@@ -1054,9 +1050,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>"
@@ -1232,9 +1225,6 @@ msgstr "Зареждане на сесия"
msgid "Load a session from file."
msgstr "Зареждане на сесия от файл."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Сесия (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Отваряне на сесия"
@@ -1387,18 +1377,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} части"
@@ -1493,6 +1479,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 "Отмяна"
@@ -1777,6 +1784,9 @@ 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} остава)"
@@ -2000,8 +2010,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] ""
@@ -2435,6 +2445,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2640,8 +2653,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 ""
@@ -2727,6 +2739,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr "Промяна на възел {0}"
@@ -2763,10 +2778,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"
@@ -2789,8 +2804,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}''"
@@ -2900,6 +2915,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} възел"
@@ -2960,11 +2978,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 "Релация"
@@ -2993,11 +3009,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 "Роли в релации, отнасящи се за"
@@ -3017,6 +3033,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 ""
@@ -3047,21 +3066,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 "
@@ -3071,11 +3088,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 "
@@ -3084,13 +3099,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 ""
@@ -3104,8 +3117,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}"
@@ -3135,11 +3148,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}''."
@@ -3292,8 +3304,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 ""
@@ -3400,7 +3411,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3438,9 +3449,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3481,6 +3489,9 @@ msgstr "друго при проверка"
msgid "Running test {0}"
msgstr "Проверява се за: {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Адреси"
@@ -3505,6 +3516,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 ""
@@ -3566,6 +3586,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Повтарящи се точки"
@@ -3648,6 +3671,15 @@ 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 "Мултиполигон"
@@ -3717,6 +3749,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 ""
@@ -3776,13 +3814,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})"
@@ -3818,13 +3856,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}"
@@ -3963,8 +3999,8 @@ msgid "Use the default spellcheck file (recommended)."
msgstr ""
"Използване на файла за проверка на правопис по подразбиране (препоръчвано)."
-msgid "Fix properties"
-msgstr "Поправи параметрите"
+msgid "Fix tags"
+msgstr ""
msgid "Could not find element type"
msgstr "Не може да бъде открит типа на елемента"
@@ -4038,6 +4074,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr "Това проверява дали пътища, които са кръгови са затворени."
+msgid "Unclosed way"
+msgstr "Незатворен път"
+
msgid "natural type {0}"
msgstr "естествен тип {0}"
@@ -4068,9 +4107,6 @@ msgstr "сграда"
msgid "area"
msgstr "област"
-msgid "Unclosed way"
-msgstr "Незатворен път"
-
msgid "Unconnected ways"
msgstr ""
@@ -4096,10 +4132,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''"
@@ -4163,25 +4199,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 ""
@@ -4285,7 +4302,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"
@@ -4521,6 +4538,18 @@ 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 "Аудио"
@@ -4625,21 +4654,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 ""
@@ -4927,29 +4941,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"
@@ -4964,8 +4996,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 "Надолу"
@@ -5017,14 +5049,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 "Възел"
@@ -5274,14 +5298,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 ""
@@ -5804,6 +5828,9 @@ msgstr "Показване/скриване"
msgid "Information about layer"
msgstr "Информация за слоя"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5887,6 +5914,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 "Връзки"
@@ -5965,6 +6019,18 @@ msgstr ""
msgid "Authors"
msgstr "Автори"
+msgid "Always shown"
+msgstr ""
+
+msgid "Dynamic"
+msgstr ""
+
+msgid "Always hidden"
+msgstr ""
+
+msgid "Authors"
+msgstr "Автори"
+
msgid "Open a list of people working on the selected objects."
msgstr "Покажи списък хора, работещи по избраните обекти."
@@ -5979,8 +6045,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 ""
@@ -6150,9 +6215,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 ""
@@ -6437,8 +6499,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"
@@ -6503,35 +6565,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 "Промяна на релация"
@@ -6545,13 +6619,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)"
@@ -6705,7 +6779,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"
@@ -7023,6 +7097,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 "Отметки"
@@ -7158,47 +7253,20 @@ msgstr ""
msgid "Download object"
msgstr "Сваляне на обект"
-msgid "Object type:"
-msgstr "Тип на обекта:"
+msgid "Start downloading"
+msgstr "Започни сваляне"
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "смесен"
+msgid ""
+"Select if the referrers of the object should be downloaded as well, "
+"i.e.,parent relations and for nodes, additionally, parent ways"
+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 ""
-"Select if the referrers of the object should be downloaded as well, "
-"i.e.,parent relations and for nodes, additionally, parent ways"
-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/>"
+msgid "Select if the members of a relation should be downloaded as well"
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 ""
@@ -7295,7 +7363,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."
@@ -7394,6 +7462,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7494,7 +7565,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"
@@ -7513,6 +7584,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 ""
@@ -7581,8 +7658,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"
@@ -7657,8 +7733,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 ""
@@ -7672,8 +7748,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"
@@ -7889,12 +7964,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 "
@@ -7903,6 +7972,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 ""
@@ -7918,6 +8003,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 "Прекъсване на качването и продължаване с редактирането"
@@ -7925,8 +8025,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 ..."
@@ -8049,9 +8149,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} обект..."
@@ -8061,6 +8158,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>"
@@ -8077,7 +8177,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:"
@@ -8223,7 +8323,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8253,7 +8353,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"
@@ -8619,9 +8719,6 @@ msgstr "Извличане на GPS координати от EXIF"
msgid "Starting directory scan"
msgstr "Започване на преглед на директории"
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr "Прочитане на снимки..."
@@ -8640,6 +8737,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 "Изображения с данни за местоположение"
@@ -8697,6 +8797,12 @@ msgstr "Следващ"
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "Центриране на изгледа"
@@ -8767,9 +8873,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 ""
@@ -8963,14 +9066,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}''..."
@@ -8985,7 +9084,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"
@@ -8995,8 +9094,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:"
@@ -9216,7 +9314,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}''"
@@ -9948,7 +10046,7 @@ msgstr ""
msgid "Advanced Background: Changed"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid "Advanced Background: NonDefault"
msgstr ""
msgid "Current value is default."
@@ -10016,6 +10114,9 @@ msgstr "Изобразявай виртуални възли в режим на
msgid "Draw inactive layers in other color"
msgstr "Изобразявай неактивните слоеве в друг цвят"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -10071,6 +10172,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 ""
@@ -10541,6 +10647,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 ""
@@ -10604,8 +10716,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"
@@ -10863,40 +10975,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}''"
@@ -10949,8 +11061,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:"
@@ -10959,20 +11071,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 ""
@@ -11054,16 +11171,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 ""
@@ -11134,8 +11245,8 @@ msgstr "Прилагане шаблон"
msgid "New relation"
msgstr ""
-msgid "Change Properties"
-msgstr "Промяна параметри"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -11143,8 +11254,8 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
-msgid "More information about this feature"
-msgstr "Повече информация за тази възможност"
+msgid "Change Properties"
+msgstr "Промяна параметри"
msgid "Available roles"
msgstr ""
@@ -11213,9 +11324,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr "Не може да се прочете източник на шаблони за маркиране: {0}"
-
msgid "Error parsing {0}: "
msgstr "Грешка при разбор {0}: "
@@ -11234,6 +11342,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 ""
@@ -11263,9 +11379,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 ""
@@ -11296,7 +11454,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 ""
@@ -11336,28 +11494,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..."
@@ -11456,6 +11612,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}."
@@ -11471,12 +11630,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}."
@@ -11555,8 +11722,8 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
-msgstr "Успешно NMEA импортиране"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "Грешка при NMEA импортиране!"
@@ -11654,35 +11821,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 ""
@@ -11692,8 +11835,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 ..."
@@ -11720,10 +11863,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>"
@@ -11809,8 +11949,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}."
@@ -11987,6 +12127,15 @@ msgstr ""
msgid "Load data from API"
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 ""
+
msgid "Import data from URL"
msgstr ""
@@ -12008,7 +12157,7 @@ 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}"
@@ -12057,6 +12206,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."
@@ -12087,19 +12245,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 ""
@@ -12121,11 +12279,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 ""
@@ -12195,13 +12365,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}''"
@@ -12345,10 +12515,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"
@@ -12363,22 +12533,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}''"
@@ -12453,8 +12622,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..."
@@ -12469,9 +12637,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}''"
@@ -12793,12 +12976,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12809,9 +12991,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 ""
@@ -12843,9 +13068,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."
@@ -13172,6 +13411,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 ""
@@ -13427,6 +13671,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."
@@ -13478,9 +13725,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 ""
@@ -13521,6 +13765,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 ""
@@ -13651,6 +13900,9 @@ msgstr "Насип"
msgid "Lit"
msgstr "осветен(-а)"
+msgid "Toll"
+msgstr "Пътна такса"
+
msgid "Motorway Link"
msgstr "Автомагистрална връзка"
@@ -13741,6 +13993,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 "Жилищна улица"
@@ -13759,11 +14055,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 "алея"
@@ -13774,6 +14070,9 @@ msgstr "автомобилен"
msgid "parking_aisle"
msgstr "паркинг"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Улица паркинг"
@@ -13801,18 +14100,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 "Без изход"
@@ -13822,9 +14115,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr "с назначение"
-
msgid "delivery"
msgstr ""
@@ -13834,15 +14124,15 @@ msgstr "разрешителен"
msgid "private"
msgstr "частен"
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr "селскостопански"
msgid "forestry"
msgstr "горски път"
-msgid "no"
-msgstr "не"
-
msgid "official"
msgstr ""
@@ -13888,6 +14178,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr "Обществен транспорт"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Мин. скорост (км/ч)"
@@ -13972,6 +14265,9 @@ msgstr "Редактирай мост"
msgid "viaduct"
msgstr "виадукт"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -14076,21 +14372,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 ""
@@ -14106,10 +14411,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"
@@ -14145,7 +14450,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -14214,12 +14519,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 "Тип пешеходна пътека"
@@ -14235,15 +14546,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)"
@@ -14265,6 +14567,15 @@ msgstr "pegasus"
msgid "tiger"
msgstr "tiger"
+msgid "Crossing attendant"
+msgstr "Помощник при пресъчане"
+
+msgid "Cross by bicycle"
+msgstr "Пресичане с велосипед"
+
+msgid "Cross on horseback"
+msgstr "Пресичане върху кон"
+
msgid "Stop"
msgstr "Стоп"
@@ -14274,6 +14585,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Мини кръгово движение"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Посока"
@@ -14283,11 +14597,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 ""
@@ -14319,9 +14630,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr "Обръщало"
@@ -14364,6 +14672,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr "Разрешено преминаване:"
+msgid "Material"
+msgstr "Материал"
+
+msgid "stone"
+msgstr "камък"
+
msgid "Bollard"
msgstr "колчета"
@@ -14379,6 +14693,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr "пластмаса"
+
msgid "Cycle Barrier"
msgstr "Вело бариера"
@@ -14448,19 +14765,16 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
-msgstr ""
-
-msgid "split_rail"
+msgid "pole"
msgstr ""
-msgid "chain"
+msgid "Guard Rail"
msgstr ""
-msgid "hedge"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14491,6 +14805,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14500,11 +14815,11 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
-msgstr "Вход"
+msgid "Entrance (barrier opening)"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Редактирай вход"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Порта"
@@ -14557,12 +14872,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr "Материал"
-
-msgid "stone"
-msgstr "камък"
-
msgid "Turnstile"
msgstr "турникет (контрол на достъпа)"
@@ -14623,12 +14932,21 @@ msgstr "Редактирай отточен канал"
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr "Поток"
msgid "Edit Stream"
msgstr "Редактирай поток"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Канал"
@@ -14668,9 +14986,6 @@ msgstr "Редактирай язовирна стена"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14704,6 +15019,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 "Суша"
@@ -14785,18 +15115,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 ""
@@ -14872,7 +15207,7 @@ msgstr "туризъм"
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14896,10 +15231,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"
@@ -14911,9 +15249,6 @@ msgstr "Теснолинейка"
msgid "Edit Narrow Gauge Rail"
msgstr "Редактирай теснолинейка"
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr "Монорелса"
@@ -14965,6 +15300,9 @@ msgstr ""
msgid "Level Crossing"
msgstr "Регулиран ЖП прелез"
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14977,18 +15315,32 @@ msgstr ""
msgid "Barrier"
msgstr ""
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
msgid "half"
-msgstr "среден"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "пълен"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "double_half"
msgstr ""
msgid "Crossing"
msgstr "ЖП прелез"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Тип пресичане"
@@ -15088,11 +15440,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -15104,11 +15454,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -15127,12 +15475,12 @@ msgstr "наземен"
msgid "underground"
msgstr "подземен"
+msgid "rooftop"
+msgstr ""
+
msgid "Access"
msgstr "Достъп"
-msgid "customers"
-msgstr ""
-
msgid "Park and Ride"
msgstr ""
@@ -15160,9 +15508,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Капацитет"
@@ -15184,10 +15529,29 @@ 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"
@@ -15337,6 +15701,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr "Волтаж"
+
msgid "Amperage"
msgstr ""
@@ -15358,6 +15725,12 @@ msgstr "Сервиз"
msgid "Edit Car Repair"
msgstr "Редактирай автосервиз"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15385,6 +15758,12 @@ msgstr "Под наем"
msgid "Edit Car Rental"
msgstr "Редактиране коли под наем"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "Споделяне на автомобили"
@@ -15409,22 +15788,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 ""
@@ -15446,9 +15809,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Дрехи"
@@ -15643,6 +16003,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15673,6 +16036,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Скамейка"
@@ -15685,9 +16051,6 @@ msgstr "Инвалидна количка"
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15697,8 +16060,13 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
-msgstr ""
+msgstr "Гара / Спирка"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Редактиране: гара / станция"
msgid "Building"
msgstr "Сграда"
@@ -15712,6 +16080,9 @@ msgstr "Редактирай вход в метро"
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15736,14 +16107,6 @@ msgstr "клиентски карти"
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr "Гара / Спирка"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Редактиране: гара / станция"
-
msgid "UIC-Reference"
msgstr "UIC-Референция"
@@ -15792,8 +16155,8 @@ msgstr "Редактирай автобусна платформа"
msgid "Taxi"
msgstr "Такси"
-msgid "Edit Taxi station"
-msgstr "Редактирай стоянка таксита"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Летище"
@@ -15846,6 +16209,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 ""
@@ -15868,21 +16246,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 ""
@@ -16072,9 +16435,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "вторник-неделя 08:00-15:00; събота 08:00-12:00"
-
msgid "Tourism"
msgstr "Туризъм"
@@ -16096,9 +16456,15 @@ msgstr "Наблюдателница"
msgid "Information Office"
msgstr "Информационен пункт"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Карта"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -16111,6 +16477,9 @@ msgstr "улица"
msgid "scheme"
msgstr "схема"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -16150,6 +16519,9 @@ msgstr "... възможни са други способи за придвиж
msgid "Information Board"
msgstr "Информационно табло"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Съдържание на таблото"
@@ -16171,23 +16543,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 "Места за отдих и развлечения"
@@ -16316,50 +16700,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 "Конфесия"
@@ -16376,6 +16754,12 @@ msgstr "Католическо"
msgid "evangelical"
msgstr "Евангелска"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "Свидетели на Йехова"
@@ -16388,6 +16772,9 @@ msgstr "Методизъм"
msgid "mormon"
msgstr "Мормони"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "Православие"
@@ -16406,39 +16793,139 @@ 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 "Обществена сграда"
@@ -16526,6 +17013,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 "Здраве"
@@ -16607,55 +17100,139 @@ msgstr "Ветеринар"
msgid "Edit Veterinary"
msgstr "Редактирай ветеринар"
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
-msgstr "Пощенска кутия"
+msgid "Access rights"
+msgstr ""
-msgid "Telephone"
-msgstr "Телефон"
+msgid "public"
+msgstr ""
-msgid "Edit Telephone"
-msgstr "Редактирай телефон"
+msgid "seasonal"
+msgstr ""
-msgid "Telephone cards"
-msgstr "Телефонни карти"
+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 ""
+
+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 "Телефон"
+
+msgid "Edit Telephone"
+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 ""
+
+msgid "Edit Clock"
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "analog"
+msgstr ""
+
+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 ""
@@ -16683,8 +17260,8 @@ msgstr ""
msgid "Recycling"
msgstr "Рециклиране"
-msgid "Edit Recycling station"
-msgstr "Редактиране на станция за рециклиране"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Батерии"
@@ -16710,21 +17287,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 "plastic"
-msgstr "пластмаса"
-
msgid "Amount of Seats"
msgstr "Брой седящи места"
@@ -16759,8 +17330,17 @@ msgstr "Редактирай ловно скривалище"
msgid "Height"
msgstr "Височина"
+msgctxt "height"
msgid "low"
-msgstr "нисък"
+msgstr ""
+
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
msgid "Hide"
msgstr "Скривалище"
@@ -16768,9 +17348,6 @@ msgstr "Скривалище"
msgid "Lock"
msgstr "Заключване"
-msgid "Drinking Water"
-msgstr "Питейна вода"
-
msgid "Edit Source of Potable Water"
msgstr ""
@@ -16802,6 +17379,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16839,119 +17419,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 "Спортен център"
@@ -16983,26 +17599,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 ""
@@ -17010,6 +17627,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "игрище"
+
+msgid "sports_centre"
+msgstr "спортен център"
+
+msgid "stadium"
+msgstr "стадион"
+
msgid "10pin"
msgstr "Боулинг зала"
@@ -17043,6 +17669,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 "Надпреварване с кучета"
@@ -17099,7 +17741,7 @@ msgid "Skating"
msgstr "Фигурно пързаляне"
msgid "Edit Skating"
-msgstr "Редактирай фигурно пързаляне"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -17143,36 +17785,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 ""
@@ -17215,19 +17875,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 ""
@@ -17366,6 +18022,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 ""
@@ -17378,60 +18046,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 "Кула"
@@ -17656,41 +18398,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"
@@ -17699,8 +18467,8 @@ msgstr "Точка на наблюдение"
msgid "Edit Survey Point"
msgstr "Редактирай точка на наблюдение"
-msgid "Surveillance"
-msgstr "Видеонаблюдение"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Редактирай видеонаблюдение"
@@ -17711,12 +18479,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 "Електроцентрала"
@@ -17768,89 +18626,192 @@ 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 "battery charging"
+msgid "solar photovoltaic"
msgstr ""
-msgid "Power Station"
-msgstr "Електростанция"
+msgid "solar_thermal_collector"
+msgstr ""
-msgid "Edit Power Station"
-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 "Електроподстанция"
@@ -17861,6 +18822,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 ""
@@ -17876,6 +18852,9 @@ msgstr "Редактирай стълб от ЕПМ"
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17894,11 +18873,9 @@ msgstr "Редактирай линия за електропренос"
msgid "Line type"
msgstr "Тип на линия"
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -18007,11 +18984,11 @@ msgstr "Будка"
msgid "Edit Kiosk"
msgstr "Редактирай будка"
-msgid "Baker"
-msgstr "Фурна"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Редактирай фурна"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Месарница"
@@ -18022,7 +18999,7 @@ msgstr "Редактирай месарница"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -18043,6 +19020,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr "Био магазин"
+
msgid "Greengrocer"
msgstr ""
@@ -18055,9 +19035,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr "Био магазин"
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -18127,7 +19104,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -18148,13 +19125,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"
@@ -18163,9 +19140,8 @@ msgstr "Аудио HiFi"
msgid "Edit Hifi Shop"
msgstr "Редактирай магазин за Аудио HiFi"
-msgctxt "shop"
msgid "Video"
-msgstr ""
+msgstr "Видео"
msgid "Edit Video Shop"
msgstr "Редактирай Видео-магазин"
@@ -18191,6 +19167,12 @@ msgstr "Редактирай обмяна на валута"
msgid "Edit Automated Teller Machine"
msgstr "Редактирай банкомат"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -18227,10 +19209,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"
@@ -18260,7 +19263,7 @@ msgstr "Редактирай железария"
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18272,19 +19275,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"
@@ -18320,7 +19323,7 @@ msgstr "Редактиране на туристическа агенция"
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18533,6 +19536,12 @@ msgstr "Връх"
msgid "Edit Peak"
msgstr "Редактиране връх"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Ледник"
@@ -18572,26 +19581,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 "Гора"
@@ -18599,15 +19617,6 @@ msgstr "Гора"
msgid "Edit Forest Landuse"
msgstr "редактиране на \"залесена площ\""
-msgid "coniferous"
-msgstr "иглолистен"
-
-msgid "deciduous"
-msgstr "широколистен"
-
-msgid "mixed"
-msgstr "смесен"
-
msgid "Grassland"
msgstr ""
@@ -18683,6 +19692,12 @@ msgstr "Поляна"
msgid "Edit Meadow Landuse"
msgstr "Редактиране поляна"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Лозе"
@@ -18737,8 +19752,8 @@ msgstr "Спортна площадка"
msgid "Edit Recreation Ground Landuse"
msgstr "Редактирай спортна площадка"
-msgid "Residential area"
-msgstr "Жилищна зона"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "Редактирай жилищна зона"
@@ -18749,6 +19764,9 @@ msgstr "Църковно гробище"
msgid "Edit Graveyard"
msgstr "Редактирай църковно гробище"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Гробище"
@@ -18824,6 +19842,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 "Редактиране на информацията за адреса"
@@ -18857,8 +19902,20 @@ msgstr "нечетни"
msgid "even"
msgstr "четни"
-msgid "alphabetic"
-msgstr "по азбучен ред"
+msgid "alphabetic"
+msgstr "по азбучен ред"
+
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
msgid "Contact (common schema)"
msgstr ""
@@ -19028,20 +20085,49 @@ msgstr ""
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 "пеш"
+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 "Описание на символ"
@@ -19088,19 +20174,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"
@@ -19124,7 +20213,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -19220,18 +20309,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 "кон"
@@ -19241,8 +20339,11 @@ msgstr "бариера"
msgid "motorroad"
msgstr "автомобилен път"
-msgid "highway_track"
-msgstr "път_от_пътна_мрежа"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "услуги"
@@ -19250,11 +20351,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 "речен бряг"
@@ -19271,6 +20372,9 @@ msgstr ""
msgid "railwaypoint"
msgstr "ЖП точка"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19286,29 +20390,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 "захранване"
@@ -19328,20 +20432,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 "хотел"
@@ -19415,10 +20519,13 @@ msgstr "маршрут"
msgid "boundary"
msgstr "граница"
+msgid "sport"
+msgstr "спорт"
+
msgid "place"
msgstr "място"
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19433,9 +20540,6 @@ msgstr "Град/Село"
msgid "One Way"
msgstr "Еднопосочна"
-msgid "Church"
-msgstr "Църква"
-
msgid "Fuel Station"
msgstr "Бензиностанция"
@@ -19463,6 +20567,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19508,10 +20615,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"
@@ -19523,7 +20660,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"
@@ -19541,7 +20678,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19658,19 +20795,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 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"
@@ -19689,7 +20937,46 @@ 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 "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 "Landsat"
@@ -19701,19 +20988,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 "skobbler heatmap"
@@ -19734,7 +21030,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19743,6 +21039,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19889,6 +21188,29 @@ 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 ""
@@ -20054,6 +21376,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -20099,6 +21424,39 @@ msgstr ""
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 "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 ""
@@ -20293,13 +21651,25 @@ msgstr "Не е придоставено описание. Моля напише
msgid "Uploading GPX Track"
msgstr "Качване на GPX следа"
-msgid "Uploads traces to openstreetmap.org"
-msgstr "Качване на следи на openstreetmap.org"
+msgid "Uploads traces to openstreetmap.org"
+msgstr "Качване на следи на openstreetmap.org"
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
+msgstr ""
+
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20323,13 +21693,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20592,10 +21956,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20799,7 +22166,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"
@@ -21070,15 +22437,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -21249,6 +22607,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 ""
@@ -21267,12 +22628,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21420,6 +22775,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 ""
@@ -21438,6 +22796,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=...\" към ?"
@@ -21670,8 +23031,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 "Векторизиран."
@@ -21722,7 +23086,7 @@ msgstr "Изтриване на избраната схема от списък
msgid "Color Schemes"
msgstr "Цветни схеми"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21909,6 +23273,71 @@ msgstr ""
msgid "Show users on map"
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 "Само позиция"
@@ -21948,27 +23377,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 "Импортиране на данни от устройство."
@@ -23064,9 +24475,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 ""
@@ -23715,9 +25147,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Възникна грешка: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "Невъзможно да бъде създаден нов бъг. Резултат: {0}"
-
msgid "Process queue"
msgstr ""
@@ -23774,18 +25203,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 ""
@@ -24135,6 +25552,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -24286,6 +25724,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 ""
@@ -24603,9 +26044,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24821,6 +26259,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 ""
@@ -24853,15 +26294,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 ""
@@ -24976,9 +26433,6 @@ msgstr "Настройки на разширение маршрутизатор"
msgid "Configure routing preferences."
msgstr "Настройване предпочитания за маршрутизиране"
-msgid "Highway type"
-msgstr "Клас път"
-
msgid "Speed (Km/h)"
msgstr "Скорост (км/ч)"
@@ -25157,19 +26611,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"
@@ -25390,6 +26844,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 ""
@@ -25426,6 +26969,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..."
@@ -25578,9 +27124,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26566,9 +28109,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr "Видео"
-
msgid "Import Video"
msgstr ""
@@ -26847,9 +28387,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 2baccf8..15248aa 100644
--- a/i18n/po/bn.po
+++ b/i18n/po/bn.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-04 03:41+0200\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"
@@ -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-08-05 04:35+0000\n"
-"X-Generator: Launchpad (build 16718)\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"
@@ -50,6 +50,9 @@ msgstr "পটভূমি ব্যবহারের শর্তাবলী"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 "
@@ -254,9 +257,6 @@ msgstr "টুল:{0}"
msgid "Please select at least four nodes."
msgstr "দয়া করে অন্তত চার নোড নির্বাচন করুন।"
-msgid "Information"
-msgstr "তথ্যাদি"
-
msgid "Align Nodes in Line"
msgstr "লাইনে নোড সারি দিয়ে সাজান"
@@ -293,6 +293,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr "বড় করে দেখতে কিছুই নির্বাচন করা হয়নি"
+msgid "Information"
+msgstr "তথ্যাদি"
+
msgid "Zoom to {0}"
msgstr "{0} তে করে ছোট বা বড় করে দেখুন।"
@@ -349,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 ""
@@ -529,6 +532,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -642,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 ""
@@ -792,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"
@@ -978,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 ""
@@ -1001,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>"
@@ -1169,9 +1168,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1310,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"
@@ -1405,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 ""
@@ -1689,6 +1706,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1908,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] ""
@@ -2334,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 ""
@@ -2530,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 ""
@@ -2617,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 ""
@@ -2653,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"
@@ -2679,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}''"
@@ -2784,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] ""
@@ -2844,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"
@@ -2875,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"
@@ -2899,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 ""
@@ -2929,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 ""
@@ -2949,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 ""
@@ -2958,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 ""
@@ -2978,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}"
@@ -3009,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}''."
@@ -3166,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 ""
@@ -3274,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 ""
@@ -3312,9 +3339,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3353,6 +3377,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3377,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 ""
@@ -3436,6 +3472,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3518,6 +3557,15 @@ 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 ""
@@ -3587,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 ""
@@ -3644,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})"
@@ -3682,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}"
@@ -3819,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"
@@ -3894,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 ""
@@ -3924,9 +3981,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3951,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''"
@@ -4017,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 ""
@@ -4137,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"
@@ -4366,6 +4403,18 @@ 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 ""
@@ -4470,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 ""
@@ -4770,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"
@@ -4807,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"
@@ -4859,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 ""
@@ -5116,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 ""
@@ -5644,6 +5690,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5727,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 ""
@@ -5817,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 ""
@@ -5988,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 ""
@@ -6275,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"
@@ -6341,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"
@@ -6383,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)"
@@ -6543,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"
@@ -6861,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 ""
@@ -6992,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 ""
@@ -7016,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 ""
@@ -7129,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."
@@ -7228,6 +7304,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7315,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"
@@ -7334,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 ""
@@ -7400,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"
@@ -7476,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 ""
@@ -7491,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"
@@ -7707,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 "
@@ -7721,13 +7798,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7736,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 ""
@@ -7743,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 ..."
@@ -7856,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] ""
@@ -7868,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>"
@@ -7884,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:"
@@ -8030,7 +8138,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8060,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"
@@ -8413,9 +8521,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8434,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 ""
@@ -8491,6 +8599,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8557,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 ""
@@ -8740,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}''..."
@@ -8762,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"
@@ -8772,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:"
@@ -8993,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}''"
@@ -9708,6 +9814,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9776,6 +9915,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9829,6 +9971,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 ""
@@ -10285,6 +10432,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 ""
@@ -10348,7 +10501,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 ""
@@ -10606,40 +10759,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}''"
@@ -10692,8 +10845,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:"
@@ -10702,20 +10855,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 ""
@@ -10797,14 +10955,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"
@@ -10877,7 +11029,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10956,9 +11108,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10977,6 +11126,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 ""
@@ -11006,9 +11163,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 ""
@@ -11039,7 +11236,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 ""
@@ -11079,28 +11276,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..."
@@ -11195,6 +11390,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11210,12 +11408,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}."
@@ -11294,7 +11500,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11393,35 +11599,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 ""
@@ -11431,8 +11613,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 ..."
@@ -11459,10 +11641,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>"
@@ -11546,8 +11725,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}."
@@ -11744,7 +11923,7 @@ 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}"
@@ -11790,6 +11969,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."
@@ -11820,19 +12008,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 ""
@@ -11854,11 +12042,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 ""
@@ -11928,13 +12128,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}''"
@@ -12077,10 +12277,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"
@@ -12095,22 +12295,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}''"
@@ -12179,8 +12378,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..."
@@ -12195,9 +12393,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}''"
@@ -12519,12 +12732,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12535,27 +12747,70 @@ 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 "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] ""
+
+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"
@@ -12569,9 +12824,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."
@@ -12894,6 +13163,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 ""
@@ -13133,6 +13407,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."
@@ -13182,9 +13459,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 ""
@@ -13221,6 +13495,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 ""
@@ -13351,6 +13630,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13441,6 +13723,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 ""
@@ -13459,10 +13785,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13474,6 +13800,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13501,18 +13830,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 ""
@@ -13522,9 +13845,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13534,13 +13854,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13588,6 +13908,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13672,6 +13995,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13776,21 +14102,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 ""
@@ -13806,10 +14141,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"
@@ -13845,7 +14180,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13914,12 +14249,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 ""
@@ -13935,15 +14276,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 ""
@@ -13965,6 +14297,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13974,6 +14315,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13983,10 +14327,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14019,9 +14360,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14061,7 +14399,19 @@ msgstr ""
msgid "Edit Block"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
msgstr ""
msgid "Bollard"
@@ -14079,6 +14429,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14133,6 +14486,21 @@ msgstr ""
msgid "Taxon"
msgstr ""
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr ""
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr ""
@@ -14148,19 +14516,16 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
-msgstr ""
-
-msgid "split_rail"
+msgid "pole"
msgstr ""
-msgid "chain"
+msgid "Guard Rail"
msgstr ""
-msgid "hedge"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14191,6 +14556,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14200,10 +14566,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14257,12 +14623,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14323,12 +14683,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14368,9 +14737,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14404,6 +14770,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 ""
@@ -14485,18 +14866,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 ""
@@ -14572,7 +14958,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14596,10 +14982,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"
@@ -14611,9 +15000,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14665,6 +15051,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14677,18 +15066,32 @@ 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 ""
@@ -14788,11 +15191,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14804,11 +15205,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14827,10 +15226,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14860,9 +15259,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14884,10 +15280,29 @@ 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"
@@ -15037,6 +15452,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15058,6 +15476,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15085,6 +15509,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15109,22 +15539,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 ""
@@ -15146,9 +15560,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15343,6 +15754,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15373,6 +15787,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15385,9 +15802,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15397,9 +15811,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15412,6 +15831,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15436,14 +15858,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15492,7 +15906,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15546,41 +15960,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"
@@ -15772,9 +16186,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15796,9 +16207,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15811,6 +16228,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15850,6 +16270,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15871,22 +16294,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"
@@ -16016,49 +16451,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"
@@ -16076,6 +16505,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16088,6 +16523,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16106,37 +16544,137 @@ 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"
@@ -16226,6 +16764,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 ""
@@ -16307,128 +16851,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16459,16 +17081,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16502,6 +17130,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16539,117 +17170,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 ""
@@ -16683,33 +17350,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 ""
@@ -16743,6 +17420,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 ""
@@ -16843,36 +17536,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 ""
@@ -16915,19 +17626,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 ""
@@ -17066,6 +17773,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 ""
@@ -17078,60 +17797,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 ""
@@ -17356,41 +18149,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"
@@ -17399,7 +18218,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17411,12 +18230,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 ""
@@ -17468,88 +18377,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17561,6 +18573,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 ""
@@ -17576,6 +18603,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17594,11 +18624,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17707,10 +18735,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17722,7 +18750,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17743,6 +18771,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17755,9 +18786,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17827,7 +18855,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17848,13 +18876,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"
@@ -17863,7 +18891,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17891,6 +18918,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17927,10 +18960,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"
@@ -17960,7 +19014,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17972,19 +19026,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"
@@ -18020,7 +19074,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18233,6 +19287,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18272,24 +19332,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 ""
@@ -18299,15 +19368,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18383,6 +19443,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18437,7 +19503,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18449,6 +19515,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18485,43 +19554,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18560,6 +19656,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18728,21 +19836,50 @@ 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 ""
+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 ""
@@ -18788,19 +19925,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"
@@ -18824,7 +19964,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18920,18 +20060,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 ""
@@ -18941,7 +20090,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18950,10 +20102,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18971,6 +20123,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18986,28 +20141,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"
@@ -19028,19 +20183,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"
@@ -19115,10 +20270,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19133,9 +20291,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19163,6 +20318,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19208,10 +20366,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"
@@ -19223,7 +20411,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"
@@ -19241,7 +20429,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19358,19 +20546,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 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"
@@ -19389,7 +20688,46 @@ 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 "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 "Landsat"
@@ -19401,19 +20739,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 "skobbler heatmap"
@@ -19434,7 +20781,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19443,6 +20790,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19589,6 +20939,29 @@ 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 ""
@@ -19754,6 +21127,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19799,6 +21175,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19985,19 +21394,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20021,13 +21442,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20290,10 +21705,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20497,7 +21915,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"
@@ -20768,15 +22186,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20947,6 +22356,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 ""
@@ -20965,12 +22377,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21106,6 +22512,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 ""
@@ -21123,6 +22532,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 ""
@@ -21349,7 +22761,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."
@@ -21399,7 +22814,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21584,6 +22999,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21623,27 +23103,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 ""
@@ -22721,9 +24183,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 ""
@@ -23370,9 +24849,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23425,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 ""
@@ -23783,6 +25247,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23934,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 ""
@@ -24251,9 +25739,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24469,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 ""
@@ -24501,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 ""
@@ -24624,9 +26128,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24805,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"
@@ -25033,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 ""
@@ -25069,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..."
@@ -25221,9 +26814,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26209,9 +27799,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26490,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/br.po b/i18n/po/br.po
index b2c349d..cf541db 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-08-04 03:41+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-08-05 04:36+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -62,6 +65,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 ""
@@ -250,9 +256,6 @@ msgstr "Ostilh : {0}"
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr "Titouroù"
-
msgid "Align Nodes in Line"
msgstr ""
@@ -289,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr "Titouroù"
+
msgid "Zoom to {0}"
msgstr ""
@@ -343,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 ""
@@ -523,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -636,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 ""
@@ -786,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"
@@ -972,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 ""
@@ -995,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>"
@@ -1163,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1304,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"
@@ -1399,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 ""
@@ -1683,6 +1703,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1902,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] ""
@@ -2328,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 ""
@@ -2524,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 ""
@@ -2611,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 ""
@@ -2647,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"
@@ -2673,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}''"
@@ -2778,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] ""
@@ -2838,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"
@@ -2869,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"
@@ -2893,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 ""
@@ -2923,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 ""
@@ -2943,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 ""
@@ -2952,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 ""
@@ -2972,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}"
@@ -3003,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}''."
@@ -3160,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 ""
@@ -3268,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 ""
@@ -3306,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3347,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3371,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 ""
@@ -3430,6 +3469,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3512,6 +3554,15 @@ 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 ""
@@ -3581,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 ""
@@ -3638,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})"
@@ -3676,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}"
@@ -3813,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"
@@ -3888,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 ""
@@ -3918,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3945,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''"
@@ -4011,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 ""
@@ -4131,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"
@@ -4360,6 +4400,18 @@ 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 ""
@@ -4464,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 ""
@@ -4764,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"
@@ -4801,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"
@@ -4853,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 ""
@@ -5110,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 ""
@@ -5638,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5721,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 ""
@@ -5811,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 ""
@@ -5982,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 ""
@@ -6269,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"
@@ -6335,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"
@@ -6377,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)"
@@ -6537,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"
@@ -6855,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 ""
@@ -6986,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 ""
@@ -7010,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 ""
@@ -7123,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."
@@ -7222,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7309,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"
@@ -7328,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 ""
@@ -7394,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"
@@ -7470,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 ""
@@ -7485,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"
@@ -7701,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 "
@@ -7715,13 +7795,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7730,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 ""
@@ -7737,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 ..."
@@ -7850,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] ""
@@ -7862,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>"
@@ -7878,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:"
@@ -8024,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8054,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"
@@ -8407,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8428,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 ""
@@ -8485,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8551,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 ""
@@ -8734,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}''..."
@@ -8756,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"
@@ -8766,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:"
@@ -8987,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}''"
@@ -9702,6 +9811,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9770,6 +9912,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9823,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 ""
@@ -10279,6 +10429,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 ""
@@ -10342,7 +10498,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 ""
@@ -10600,40 +10756,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}''"
@@ -10686,8 +10842,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:"
@@ -10696,20 +10852,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 ""
@@ -10791,14 +10952,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,7 +11026,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10950,9 +11105,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10971,6 +11123,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 ""
@@ -11000,9 +11160,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 ""
@@ -11033,7 +11233,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 ""
@@ -11073,28 +11273,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..."
@@ -11189,6 +11387,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11204,12 +11405,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}."
@@ -11288,7 +11497,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11387,35 +11596,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 ""
@@ -11425,8 +11610,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 ..."
@@ -11453,10 +11638,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>"
@@ -11540,8 +11722,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}."
@@ -11738,7 +11920,7 @@ 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}"
@@ -11784,6 +11966,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."
@@ -11814,19 +12005,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 ""
@@ -11848,11 +12039,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 ""
@@ -11922,13 +12125,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}''"
@@ -12071,10 +12274,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"
@@ -12089,22 +12292,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}''"
@@ -12173,8 +12375,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..."
@@ -12189,9 +12390,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}''"
@@ -12513,12 +12729,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12529,30 +12744,73 @@ 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 "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] ""
+
+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"
@@ -12563,9 +12821,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."
@@ -12888,6 +13160,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 ""
@@ -13127,6 +13404,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."
@@ -13176,9 +13456,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 ""
@@ -13215,6 +13492,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 ""
@@ -13345,6 +13627,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13435,6 +13720,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 ""
@@ -13453,10 +13782,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 +13797,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13495,18 +13827,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 ""
@@ -13516,9 +13842,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13528,13 +13851,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13582,6 +13905,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13666,6 +13992,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13770,21 +14099,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 ""
@@ -13800,10 +14138,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"
@@ -13839,7 +14177,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13908,12 +14246,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 ""
@@ -13929,15 +14273,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 ""
@@ -13959,6 +14294,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13968,6 +14312,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13977,10 +14324,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14013,9 +14357,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14058,6 +14399,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14073,6 +14420,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14142,19 +14492,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14185,6 +14529,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14194,10 +14539,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14251,12 +14596,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14317,12 +14656,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14362,9 +14710,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14398,6 +14743,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 ""
@@ -14479,18 +14839,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 ""
@@ -14566,7 +14931,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14590,10 +14955,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"
@@ -14605,9 +14973,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14659,6 +15024,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14671,6 +15039,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14782,11 +15185,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14798,11 +15199,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14821,10 +15220,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14854,9 +15253,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14878,10 +15274,29 @@ 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"
@@ -15031,6 +15446,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15052,6 +15470,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15079,6 +15503,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15103,22 +15533,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 ""
@@ -15140,9 +15554,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15337,6 +15748,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15367,6 +15781,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15379,9 +15796,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15391,9 +15805,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15406,6 +15825,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15430,14 +15852,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15486,7 +15900,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15540,41 +15954,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"
@@ -15766,9 +16180,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15790,9 +16201,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15805,6 +16222,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15844,6 +16264,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15865,22 +16288,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"
@@ -16010,49 +16445,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"
@@ -16070,6 +16499,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16082,6 +16517,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16100,37 +16538,137 @@ 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"
@@ -16220,6 +16758,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 ""
@@ -16301,128 +16845,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16453,16 +17075,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16496,6 +17124,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16533,117 +17164,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 ""
@@ -16677,33 +17344,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 ""
@@ -16737,6 +17414,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 ""
@@ -16837,36 +17530,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 ""
@@ -16909,19 +17620,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 ""
@@ -17060,6 +17767,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 ""
@@ -17072,60 +17791,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 ""
@@ -17350,41 +18143,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"
@@ -17393,7 +18212,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17405,12 +18224,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 ""
@@ -17462,88 +18371,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17555,6 +18567,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 ""
@@ -17570,6 +18597,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17588,11 +18618,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17701,10 +18729,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17716,7 +18744,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17737,6 +18765,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17749,9 +18780,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17821,7 +18849,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17842,13 +18870,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"
@@ -17857,7 +18885,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17885,6 +18912,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17921,10 +18954,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"
@@ -17954,7 +19008,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17966,19 +19020,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"
@@ -18014,7 +19068,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18227,6 +19281,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18266,24 +19326,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 ""
@@ -18293,15 +19362,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18377,6 +19437,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18431,7 +19497,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18443,6 +19509,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18479,43 +19548,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18554,6 +19650,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18722,21 +19830,50 @@ 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 ""
+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 ""
@@ -18782,19 +19919,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"
@@ -18818,7 +19958,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18914,18 +20054,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 ""
@@ -18935,7 +20084,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18944,10 +20096,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18965,6 +20117,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18980,28 +20135,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"
@@ -19022,19 +20177,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"
@@ -19109,10 +20264,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19127,9 +20285,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19157,6 +20312,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19202,10 +20360,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"
@@ -19217,7 +20405,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"
@@ -19235,7 +20423,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19352,19 +20540,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 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"
@@ -19383,7 +20682,46 @@ 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 "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 "Landsat"
@@ -19395,19 +20733,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 "skobbler heatmap"
@@ -19428,7 +20775,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19437,6 +20784,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19583,6 +20933,29 @@ 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 ""
@@ -19748,6 +21121,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19793,6 +21169,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19979,19 +21388,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20015,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}''."
@@ -20284,10 +21699,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20491,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"
@@ -20762,15 +22180,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20941,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 ""
@@ -20959,12 +22371,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21100,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 ""
@@ -21117,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 ""
@@ -21343,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."
@@ -21393,7 +22808,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21578,6 +22993,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21617,27 +23097,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 ""
@@ -22715,9 +24177,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 ""
@@ -23364,9 +24843,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23419,18 +24895,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 ""
@@ -23777,6 +25241,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23928,6 +25413,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 ""
@@ -24245,9 +25733,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24463,6 +25948,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 ""
@@ -24495,15 +25983,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 ""
@@ -24618,9 +26122,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24799,19 +26300,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"
@@ -25027,6 +26528,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 ""
@@ -25063,6 +26653,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..."
@@ -25215,9 +26808,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26203,9 +27793,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26484,9 +28071,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 47d8d23..f6134d5 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-08-04 03:41+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-08-05 04:36+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ 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 ""
@@ -60,6 +63,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -163,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 "
@@ -259,9 +260,6 @@ msgstr "Alat: {0}"
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr "Informacije"
-
msgid "Align Nodes in Line"
msgstr ""
@@ -298,6 +296,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr "Informacije"
+
msgid "Zoom to {0}"
msgstr ""
@@ -354,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 ""
@@ -534,6 +535,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -647,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 ""
@@ -797,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"
@@ -983,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 ""
@@ -1006,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>"
@@ -1174,9 +1171,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1315,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"
@@ -1410,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 ""
@@ -1694,6 +1709,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1913,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] ""
@@ -2339,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 ""
@@ -2535,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 ""
@@ -2622,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 ""
@@ -2658,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"
@@ -2684,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}''"
@@ -2789,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] ""
@@ -2849,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"
@@ -2880,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"
@@ -2904,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 ""
@@ -2934,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 ""
@@ -2954,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 ""
@@ -2963,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 ""
@@ -2983,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}"
@@ -3014,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}''."
@@ -3171,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 ""
@@ -3279,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 ""
@@ -3317,9 +3342,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3358,6 +3380,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3382,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 ""
@@ -3441,6 +3475,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3523,6 +3560,15 @@ 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 ""
@@ -3592,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 ""
@@ -3649,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})"
@@ -3687,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}"
@@ -3824,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"
@@ -3899,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 ""
@@ -3929,9 +3984,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3956,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''"
@@ -4022,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 ""
@@ -4142,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"
@@ -4371,6 +4406,18 @@ 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 ""
@@ -4475,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 ""
@@ -4775,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 "> 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"
@@ -4812,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"
@@ -4864,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 ""
@@ -5121,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 ""
@@ -5649,6 +5693,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5732,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 ""
@@ -5822,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 ""
@@ -5993,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 ""
@@ -6280,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"
@@ -6346,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"
@@ -6388,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)"
@@ -6548,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"
@@ -6866,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 ""
@@ -6997,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 ""
@@ -7021,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 ""
@@ -7134,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."
@@ -7233,6 +7307,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7320,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"
@@ -7339,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 ""
@@ -7405,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"
@@ -7481,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 ""
@@ -7496,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"
@@ -7712,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 "
@@ -7726,13 +7801,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7741,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 ""
@@ -7748,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 ..."
@@ -7861,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] ""
@@ -7873,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>"
@@ -7889,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:"
@@ -8035,7 +8141,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8065,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"
@@ -8418,9 +8524,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8439,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 ""
@@ -8496,6 +8602,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8562,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 ""
@@ -8745,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}''..."
@@ -8767,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"
@@ -8777,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:"
@@ -8998,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}''"
@@ -9713,6 +9817,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9781,6 +9918,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9834,6 +9974,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 ""
@@ -10290,6 +10435,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 ""
@@ -10353,7 +10504,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 ""
@@ -10611,40 +10762,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}''"
@@ -10697,8 +10848,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:"
@@ -10707,20 +10858,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 ""
@@ -10802,14 +10958,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"
@@ -10882,7 +11032,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10961,9 +11111,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10982,6 +11129,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 ""
@@ -11011,9 +11166,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 ""
@@ -11044,7 +11239,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 ""
@@ -11084,28 +11279,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..."
@@ -11200,6 +11393,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11215,12 +11411,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}."
@@ -11299,7 +11503,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11398,35 +11602,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 ""
@@ -11436,8 +11616,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 ..."
@@ -11464,10 +11644,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>"
@@ -11551,8 +11728,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}."
@@ -11749,7 +11926,7 @@ 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}"
@@ -11795,6 +11972,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."
@@ -11825,19 +12011,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 ""
@@ -11859,11 +12045,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 ""
@@ -11933,13 +12131,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}''"
@@ -12082,10 +12280,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"
@@ -12100,22 +12298,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}''"
@@ -12184,8 +12381,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..."
@@ -12200,9 +12396,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}''"
@@ -12524,12 +12735,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12540,30 +12750,73 @@ 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 "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] ""
+
+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"
@@ -12574,9 +12827,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."
@@ -12899,6 +13166,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 ""
@@ -13138,6 +13410,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."
@@ -13187,9 +13462,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 ""
@@ -13226,6 +13498,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 ""
@@ -13356,6 +13633,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13446,6 +13726,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 ""
@@ -13464,10 +13788,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13479,6 +13803,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13506,18 +13833,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 ""
@@ -13527,9 +13848,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13539,13 +13857,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13593,6 +13911,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13677,6 +13998,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13781,21 +14105,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 ""
@@ -13811,10 +14144,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"
@@ -13850,7 +14183,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13919,12 +14252,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 ""
@@ -13940,15 +14279,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 ""
@@ -13970,6 +14300,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13979,6 +14318,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13988,10 +14330,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14024,9 +14363,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14069,6 +14405,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14084,6 +14426,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14153,19 +14498,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14196,6 +14535,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14205,10 +14545,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14262,12 +14602,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14328,12 +14662,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14373,9 +14716,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14409,6 +14749,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 ""
@@ -14490,18 +14845,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 ""
@@ -14577,7 +14937,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14601,10 +14961,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"
@@ -14616,9 +14979,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14670,6 +15030,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14682,6 +15045,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14793,11 +15191,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14809,11 +15205,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14832,10 +15226,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14865,9 +15259,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14889,10 +15280,29 @@ 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"
@@ -15042,6 +15452,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15063,6 +15476,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15090,6 +15509,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15114,22 +15539,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 ""
@@ -15151,9 +15560,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15348,6 +15754,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15378,6 +15787,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15390,9 +15802,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15402,9 +15811,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15417,6 +15831,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15441,14 +15858,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15497,7 +15906,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15551,41 +15960,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"
@@ -15777,9 +16186,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15801,9 +16207,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15816,6 +16228,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15855,6 +16270,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15876,22 +16294,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"
@@ -16021,49 +16451,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"
@@ -16081,6 +16505,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16093,6 +16523,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16111,37 +16544,137 @@ 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"
@@ -16231,6 +16764,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 ""
@@ -16312,128 +16851,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16464,16 +17081,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16507,6 +17130,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16544,117 +17170,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 ""
@@ -16688,33 +17350,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 ""
@@ -16748,6 +17420,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 ""
@@ -16848,36 +17536,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 ""
@@ -16920,19 +17626,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 ""
@@ -17071,6 +17773,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 ""
@@ -17083,60 +17797,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 ""
@@ -17361,41 +18149,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"
@@ -17404,7 +18218,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17416,12 +18230,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 ""
@@ -17473,88 +18377,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17566,6 +18573,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 ""
@@ -17581,6 +18603,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17599,11 +18624,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17712,10 +18735,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17727,7 +18750,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17748,6 +18771,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17760,9 +18786,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17832,7 +18855,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17853,13 +18876,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"
@@ -17868,7 +18891,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17896,6 +18918,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17932,10 +18960,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"
@@ -17965,7 +19014,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17977,19 +19026,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"
@@ -18025,7 +19074,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18238,6 +19287,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18277,24 +19332,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 ""
@@ -18304,15 +19368,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18388,6 +19443,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18442,7 +19503,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18454,6 +19515,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18490,43 +19554,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18565,6 +19656,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18733,21 +19836,50 @@ 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 ""
+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 ""
@@ -18793,19 +19925,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"
@@ -18829,7 +19964,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18925,18 +20060,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 ""
@@ -18946,7 +20090,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18955,10 +20102,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18976,6 +20123,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18991,28 +20141,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"
@@ -19033,19 +20183,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"
@@ -19120,10 +20270,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19138,9 +20291,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19168,6 +20318,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19213,10 +20366,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"
@@ -19228,7 +20411,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"
@@ -19246,7 +20429,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19363,19 +20546,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 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"
@@ -19394,7 +20688,46 @@ 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 "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 "Landsat"
@@ -19406,19 +20739,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 "skobbler heatmap"
@@ -19439,7 +20781,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19448,6 +20790,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19594,6 +20939,29 @@ 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 ""
@@ -19759,6 +21127,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19804,6 +21175,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19990,19 +21394,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20026,13 +21442,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20295,10 +21705,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20502,7 +21915,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"
@@ -20773,15 +22186,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20952,6 +22356,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 ""
@@ -20970,12 +22377,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21111,6 +22512,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 ""
@@ -21128,6 +22532,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 ""
@@ -21354,7 +22761,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."
@@ -21404,7 +22814,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21589,6 +22999,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21628,27 +23103,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 ""
@@ -22726,9 +24183,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 ""
@@ -23375,9 +24849,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23430,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 ""
@@ -23788,6 +25247,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23939,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 ""
@@ -24256,9 +25739,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24474,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 ""
@@ -24506,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 ""
@@ -24629,9 +26128,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24810,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"
@@ -25038,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 ""
@@ -25074,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..."
@@ -25226,9 +26814,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26214,9 +27799,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26495,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/ca.po b/i18n/po/ca.po
index d52296e..3e8e5e0 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-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-08-15 06:38+0000\n"
-"Last-Translator: jmontane <Unknown>\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-08-16 04:31+0000\n"
-"X-Generator: Launchpad (build 16723)\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"
@@ -50,6 +50,9 @@ 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}"
@@ -59,6 +62,9 @@ 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"
@@ -165,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 "
@@ -267,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"
@@ -306,6 +309,9 @@ 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}"
@@ -363,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"
@@ -553,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)"
@@ -677,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"
@@ -850,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ó"
@@ -1056,16 +1066,11 @@ 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 "
@@ -1085,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>"
@@ -1270,9 +1272,6 @@ msgstr "Carrega una sessió"
msgid "Load a session from file."
msgstr "Carrega una sessió d''un fitxer."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Fitxer de la sessió (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Obre una sessió"
@@ -1426,20 +1425,20 @@ msgstr ""
"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"
@@ -1537,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"
@@ -1842,6 +1864,9 @@ 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})"
@@ -2089,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"
@@ -2574,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"
@@ -2786,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 "
@@ -2883,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}"
@@ -2919,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"
@@ -2947,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}''"
@@ -3069,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"
@@ -3123,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 "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ó"
@@ -3162,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"
@@ -3191,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}"
@@ -3225,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 "
@@ -3249,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 "
@@ -3262,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 "
@@ -3291,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}"
@@ -3324,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}''"
@@ -3503,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."
@@ -3622,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)"
@@ -3667,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"
@@ -3711,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"
@@ -3737,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"
@@ -3799,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"
@@ -3884,7 +3935,16 @@ 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})"
+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"
@@ -3959,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"
@@ -4022,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})"
@@ -4062,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}"
@@ -4211,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"
@@ -4287,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}"
@@ -4317,9 +4390,6 @@ msgstr "edifici"
msgid "area"
msgstr "àrea"
-msgid "Unclosed way"
-msgstr "Via sense tancar"
-
msgid "Unconnected ways"
msgstr "Vies sense connexió"
@@ -4346,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''"
@@ -4414,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ó)"
@@ -4537,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"
@@ -4784,6 +4834,20 @@ 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"
@@ -4891,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)"
@@ -5223,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."
@@ -5230,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."
@@ -5237,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."
@@ -5252,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"
@@ -5268,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"
@@ -5325,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"
@@ -5615,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 ""
@@ -6219,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"
@@ -6302,6 +6361,38 @@ 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''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"
@@ -6395,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 "
@@ -6579,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"
@@ -6921,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 ""
@@ -6997,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 "Properties/Memberships"
-msgstr "Propietats/Membres"
+msgid "Discardable key: selection Background"
+msgstr "Clau descartable: selecció en el fons"
-msgid "Properties for selected objects."
-msgstr "Propietats dels objectes seleccionats"
+msgid "Discardable key: foreground"
+msgstr "Clau descartable: selecció en primer pla"
+
+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ó"
@@ -7039,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)"
@@ -7211,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"
@@ -7565,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"
@@ -7716,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, "
@@ -7743,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"
@@ -7877,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."
@@ -7990,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"
@@ -8100,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"
@@ -8125,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:"
@@ -8195,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"
@@ -8283,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 "
@@ -8303,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"
@@ -8561,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 "
@@ -8580,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"
@@ -8596,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"
@@ -8603,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 ..."
@@ -8747,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 ..."
@@ -8760,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>"
@@ -8780,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:"
@@ -8937,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"
@@ -8970,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"
@@ -9356,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..."
@@ -9377,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"
@@ -9436,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"
@@ -9519,9 +9652,6 @@ 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"
@@ -9719,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}''..."
@@ -9747,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"
@@ -9761,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ó:"
@@ -10046,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}''"
@@ -10862,6 +10987,44 @@ 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"
+
+msgid "Value: "
+msgstr "Valor: "
+
+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: NonDefalut"
msgstr "Fons avançat: SensePredeterminació"
@@ -10934,6 +11097,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ó"
@@ -10998,6 +11164,13 @@ 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"
@@ -11492,6 +11665,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"
@@ -11561,10 +11740,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"
@@ -11848,21 +12025,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"
@@ -11884,6 +12046,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}''"
@@ -11951,11 +12128,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:"
@@ -11963,25 +12140,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 "Periodically check for new messages"
+msgstr "Comprova periòdicament si hi ha nous missatges"
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+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. "
@@ -12076,18 +12259,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"
@@ -12159,8 +12337,8 @@ msgstr "Aplicar"
msgid "New relation"
msgstr "Nova relació"
-msgid "Change Properties"
-msgstr "Canvia propietats"
+msgid "Change Tags"
+msgstr "Canvia les etiquetes"
msgid "Unknown requisite: {0}"
msgstr "Requisit desconegut: {0}"
@@ -12248,9 +12426,6 @@ 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}: "
@@ -12269,6 +12444,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 (*.*)"
@@ -12304,9 +12489,62 @@ msgstr ""
"El valor no és un ID vàlid. Si us plau, indiqueu un valor enter més gran que "
"zero"
+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 "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 ""
@@ -12342,11 +12580,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 ""
@@ -12396,41 +12634,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..."
@@ -12533,6 +12769,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."
@@ -12548,15 +12787,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}."
@@ -12645,8 +12892,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!"
@@ -12755,49 +13002,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 "
@@ -12807,11 +13020,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 ..."
@@ -12841,11 +13054,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>"
@@ -12940,11 +13150,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}."
@@ -13154,10 +13364,14 @@ 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 "RemoteControl::Accepting connections on port {0}"
msgstr "Control remot::Acceptant connexions a través del port {0}"
@@ -13207,6 +13421,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."
@@ -13243,20 +13466,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: "
@@ -13281,6 +13504,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"
@@ -13288,6 +13520,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}''."
@@ -13364,18 +13599,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}''"
@@ -13547,12 +13782,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"
@@ -13566,30 +13800,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 ""
-"Avís: ha fallat la instal·lació del connector ''{0}'' a partir del fitxer "
-"temporal ''{1}'' descarregat. {2}"
+"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}''"
@@ -13668,10 +13900,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 ""
@@ -13687,12 +13919,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}''"
@@ -14161,17 +14409,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}"
+msgid "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}"
+"Ha fallat la gestió del fitxer zip ''{0}''. L''excepció ha estat: {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 ""
-"Avís: ha fallat l''accés al directori ''{0}'' per raons de seguretat. "
-"L''excepcióha estat: {1}"
+"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]"
@@ -14183,9 +14429,56 @@ 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}''."
@@ -14221,8 +14514,22 @@ 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 "
@@ -14571,6 +14878,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 ""
@@ -14881,6 +15195,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."
@@ -14942,9 +15260,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"
@@ -14985,7 +15300,7 @@ 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í."
+"l''equivalent al botó esquerre del ratolí."
msgid ""
"Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -14994,6 +15309,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"
@@ -15135,6 +15457,9 @@ msgstr "Terraplè"
msgid "Lit"
msgstr "Llum"
+msgid "Toll"
+msgstr "Peatge"
+
msgid "Motorway Link"
msgstr "Enllaç d''autopista"
@@ -15225,6 +15550,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)"
@@ -15243,10 +15612,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"
@@ -15258,6 +15627,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"
@@ -15285,18 +15657,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)"
@@ -15306,9 +15672,6 @@ msgstr "Restriccions del mode de transport"
msgid "General Access"
msgstr "Accés general"
-msgid "destination"
-msgstr "destinació"
-
msgid "delivery"
msgstr "lliurament"
@@ -15318,15 +15681,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"
@@ -15372,6 +15735,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)"
@@ -15456,6 +15822,9 @@ msgstr "Edita Pont"
msgid "viaduct"
msgstr "viaducte"
+msgid "suspension"
+msgstr "suspensió"
+
msgid "swing"
msgstr "giratori"
@@ -15574,20 +15943,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"
@@ -15604,11 +15982,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"
@@ -15643,8 +16021,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"
@@ -15712,12 +16090,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"
@@ -15733,15 +16117,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)"
@@ -15763,6 +16138,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"
@@ -15772,6 +16156,9 @@ msgstr "Cediu el pas"
msgid "Mini-roundabout"
msgstr "Minirotonda"
+msgid "Edit Mini-Roundabout"
+msgstr "Modifica mini-rotonda"
+
msgid "Direction"
msgstr "Direcció"
@@ -15781,11 +16168,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"
@@ -15817,9 +16201,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"
@@ -15862,6 +16243,12 @@ msgstr "Edita bloc"
msgid "Allowed traffic:"
msgstr "Trànsit permès:"
+msgid "Material"
+msgstr "Material"
+
+msgid "stone"
+msgstr "pedra"
+
msgid "Bollard"
msgstr "Bol·lard"
@@ -15877,6 +16264,9 @@ msgstr "ascendent"
msgid "removable"
msgstr "suprimible"
+msgid "plastic"
+msgstr "plàstic"
+
msgid "Cycle Barrier"
msgstr "Barrera ciclista"
@@ -15946,20 +16336,17 @@ msgstr "tela metàl·lica"
msgid "electric"
msgstr "elèctric"
-msgid "roundpole"
-msgstr "pals rodons"
-
-msgid "split_rail"
-msgstr "divisió_de_ferrocarril"
+msgid "pole"
+msgstr "pal"
-msgid "chain"
-msgstr "cadena"
+msgid "Guard Rail"
+msgstr "Guarda-rail"
-msgid "hedge"
-msgstr "bardissa"
+msgid "Edit Guard Rail"
+msgstr "Modifica guarda-rail"
-msgid "pole"
-msgstr "pal"
+msgid "wire"
+msgstr "fil metàl·lic"
msgid "Guard Rail"
msgstr "Guarda-rail"
@@ -15989,8 +16376,9 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr "Rasa"
+msgctxt "Barrier"
msgid "Edit Ditch"
-msgstr "Edita sèquia"
+msgstr "Modifica sèquia"
msgid "Kerb"
msgstr "Vorada"
@@ -15998,11 +16386,11 @@ msgstr "Vorada"
msgid "Edit Kerb"
msgstr "Modifica vorada"
-msgid "Entrance"
-msgstr "Entrada"
+msgid "Entrance (barrier opening)"
+msgstr "Accés (barrera oberta)"
-msgid "Edit Entrance"
-msgstr "Edita l''entrada"
+msgid "Edit Entrance (barrier opening)"
+msgstr "Modifica accés (barrera oberta)"
msgid "Gate"
msgstr "Porta"
@@ -16056,12 +16444,6 @@ msgstr "pas d''escletxa"
msgid "stepover"
msgstr "pas de graons"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "pedra"
-
msgid "Turnstile"
msgstr "Torn"
@@ -16122,12 +16504,21 @@ msgstr "Editar canal de drenatge"
msgid "Ditch"
msgstr "Sèquia"
+msgid "Edit Ditch"
+msgstr "Edita sèquia"
+
msgid "Stream"
msgstr "Riera / Torrent"
msgid "Edit Stream"
msgstr "Edita riera / torrent"
+msgid "Wadi"
+msgstr "uadi"
+
+msgid "Edit Wadi"
+msgstr "Modifica uadi"
+
msgid "Canal"
msgstr "Canal"
@@ -16167,9 +16558,6 @@ msgstr "Edita presa"
msgid "Groyne"
msgstr "Espigó"
-msgid "Edit Groyne"
-msgstr "Edita Espigó"
-
msgid "Breakwater"
msgstr "Escullera"
@@ -16203,6 +16591,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"
@@ -16284,20 +16687,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"
@@ -16371,8 +16779,8 @@ msgstr "turisme"
msgid "freight"
msgstr "noli"
-msgid "Service/Type"
-msgstr "Servei/Tipus"
+msgid "Service type"
+msgstr "Tipus de servei"
msgid "yard"
msgstr "iardes"
@@ -16395,11 +16803,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 in Hertz (Hz)"
+msgstr "Freqüència en hertz (Hz)"
-msgid "Frequency (Hz)"
-msgstr "Freqüència (Hz)"
+msgid "16.67"
+msgstr "16.67"
msgid "16.7"
msgstr "16.7"
@@ -16410,9 +16821,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"
@@ -16464,6 +16872,9 @@ 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"
@@ -16476,18 +16887,32 @@ 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 "mig"
+msgstr "mitja"
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "complet"
+msgstr "completa"
+msgctxt "crossing:barrier"
msgid "double_half"
-msgstr "semibarreres"
+msgstr "doble mitja barrera"
msgid "Crossing"
msgstr "Cruïlla"
+msgid "Edit Crossing"
+msgstr "Modifica cruïlla"
+
msgid "Crossing type"
msgstr "Tipus de cruïlla"
@@ -16587,13 +17012,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"
@@ -16603,13 +17026,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"
@@ -16626,12 +17047,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)"
@@ -16659,9 +17080,6 @@ msgstr "Places d''aparcament"
msgid "Edit Parking space"
msgstr "Edita places d''aparcament"
-msgid "rooftop"
-msgstr "terrat"
-
msgid "Capacity"
msgstr "Capacitat"
@@ -16683,11 +17101,32 @@ 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 "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 "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Dim-Diu 8:00-15:00;Dis 8: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"
@@ -16836,6 +17275,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"
@@ -16857,6 +17299,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"
@@ -16884,6 +17332,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ó"
@@ -16908,22 +17362,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"
@@ -16945,9 +17383,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Parts"
-
msgid "Clothes"
msgstr "Roba"
@@ -17144,6 +17579,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"
@@ -17174,6 +17612,9 @@ msgstr "Funicular"
msgid "Ferry"
msgstr "Transbordador"
+msgid "Edit Platform"
+msgstr "Modifica andana"
+
msgid "Bench"
msgstr "Banc per seure"
@@ -17186,9 +17627,6 @@ msgstr "Cadira de rodes"
msgid "limited"
msgstr "limitat"
-msgid "only"
-msgstr "només"
-
msgid "Highway platform (legacy)"
msgstr "Andana de carretera (antiga)"
@@ -17198,9 +17636,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"
@@ -17213,6 +17656,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"
@@ -17237,14 +17683,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"
@@ -17293,8 +17731,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"
@@ -17347,6 +17785,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"
@@ -17369,21 +17822,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"
@@ -17573,9 +18011,6 @@ msgstr "Striptease"
msgid "Edit Stripclub"
msgstr "Modifica striptease"
-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 "Tourism"
msgstr "Turisme"
@@ -17597,9 +18032,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"
@@ -17612,6 +18053,9 @@ msgstr "carrer"
msgid "scheme"
msgstr "esquemàtic"
+msgid "toposcope"
+msgstr "Taula d''orientació"
+
msgid "Shown Area"
msgstr "Àrea que es mostra"
@@ -17651,6 +18095,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"
@@ -17672,23 +18119,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"
@@ -17817,50 +18276,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ó"
@@ -17877,6 +18330,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à"
@@ -17889,6 +18348,9 @@ msgstr "metodista"
msgid "mormon"
msgstr "mormó"
+msgid "new_apostolic"
+msgstr "neo apostòlica"
+
msgid "orthodox"
msgstr "ortodox"
@@ -17907,38 +18369,140 @@ 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"
@@ -18027,6 +18591,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"
@@ -18108,12 +18678,66 @@ msgstr "Veterinari"
msgid "Edit Veterinary"
msgstr "Edita Veterinari"
-msgid "Drinking water"
-msgstr "Aigua potable"
+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"
@@ -18123,6 +18747,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"
@@ -18132,30 +18780,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"
@@ -18184,8 +18838,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"
@@ -18211,21 +18865,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 "plastic"
-msgstr "plàstic"
-
msgid "Amount of Seats"
msgstr "Quantitat de seients"
@@ -18260,18 +18908,24 @@ msgstr "Edita Base de caça"
msgid "Height"
msgstr "Alçada"
+msgctxt "height"
msgid "low"
msgstr "baix"
+msgctxt "height"
+msgid "half"
+msgstr "mitja"
+
+msgctxt "height"
+msgid "full"
+msgstr "alta"
+
msgid "Hide"
msgstr "Aguait"
msgid "Lock"
msgstr "Bloca"
-msgid "Drinking Water"
-msgstr "Aigua potable"
-
msgid "Edit Source of Potable Water"
msgstr "Modifica font d''aigua potable"
@@ -18303,6 +18957,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"
@@ -18340,117 +18997,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"
@@ -18484,33 +19177,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"
@@ -18544,6 +19247,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"
@@ -18600,7 +19319,7 @@ msgid "Skating"
msgstr "Patinatge"
msgid "Edit Skating"
-msgstr "Edita patinatge"
+msgstr "Modifica patinatge"
msgid "ice_rink"
msgstr "pista de gel"
@@ -18644,38 +19363,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"
@@ -18716,19 +19453,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"
@@ -18867,6 +19600,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"
@@ -18879,59 +19624,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 "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"
@@ -19157,42 +19976,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"
@@ -19200,8 +20045,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"
@@ -19212,12 +20057,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"
@@ -19269,89 +20205,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"
@@ -19362,6 +20403,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ó"
@@ -19377,6 +20433,9 @@ msgstr "Edita Torre elèctrica"
msgid "Tower reference"
msgstr "Torre de referència"
+msgid "steel"
+msgstr "acer"
+
msgid "Pole"
msgstr "Pal"
@@ -19395,13 +20454,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"
@@ -19508,11 +20565,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"
@@ -19523,8 +20580,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)"
@@ -19544,6 +20601,9 @@ msgstr "Mercat"
msgid "Edit Marketplace"
msgstr "Edita mercat"
+msgid "Organic"
+msgstr "Orgànica"
+
msgid "Greengrocer"
msgstr "Fruiteria"
@@ -19556,9 +20616,6 @@ msgstr "Venda directa de productes agraris"
msgid "Edit Farm Stand"
msgstr "Modifica venda directa de productes agraris"
-msgid "Organic"
-msgstr "Orgànica"
-
msgid "Edit Organic/Bio"
msgstr "Modificar botiga d''aliments ecològics"
@@ -19628,8 +20685,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"
@@ -19649,14 +20706,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"
@@ -19664,7 +20721,6 @@ msgstr "Equips d''àudio"
msgid "Edit Hifi Shop"
msgstr "Edita botiga d''equips d''àudio"
-msgctxt "shop"
msgid "Video"
msgstr "Vídeo"
@@ -19692,6 +20748,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"
@@ -19728,11 +20790,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"
@@ -19761,8 +20844,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"
@@ -19773,20 +20856,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"
@@ -19821,8 +20904,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"
@@ -20034,6 +21117,12 @@ msgstr "Pic"
msgid "Edit Peak"
msgstr "Edita Pic"
+msgid "Saddle"
+msgstr "Coll"
+
+msgid "Edit Saddle"
+msgstr "Modifica coll"
+
msgid "Glacier"
msgstr "Glacera"
@@ -20073,24 +21162,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"
@@ -20100,15 +21198,6 @@ 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 "Prada"
@@ -20184,6 +21273,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"
@@ -20238,8 +21333,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"
@@ -20250,6 +21345,9 @@ msgstr "Cementiri"
msgid "Edit Graveyard"
msgstr "Edita Cementiri"
+msgid "shinto"
+msgstr "xintoisme"
+
msgid "Cemetery"
msgstr "Cementiri"
@@ -20325,6 +21423,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"
@@ -20361,6 +21486,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ú)"
@@ -20529,20 +21666,49 @@ msgstr "Ruta genèrica"
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"
@@ -20589,20 +21755,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"
@@ -20625,8 +21794,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)"
@@ -20721,18 +21890,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"
@@ -20742,8 +21920,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"
@@ -20751,11 +21932,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"
@@ -20772,6 +21953,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"
@@ -20787,29 +21971,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"
@@ -20829,20 +22013,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"
@@ -20916,11 +22100,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"
@@ -20934,9 +22121,6 @@ msgstr "Poble/Ciutat"
msgid "One Way"
msgstr "Sentit Únic"
-msgid "Church"
-msgstr "Església"
-
msgid "Fuel Station"
msgstr "Benzinera"
@@ -20964,6 +22148,9 @@ 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 "etiqueta incorrecta de cruïlla a una via"
+
msgid "Unnamed unclassified highway"
msgstr "Via no classificada sense nom"
@@ -21009,11 +22196,41 @@ 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 "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 "etiqueta \"aigua natural\" utilitzada a una piscina"
-msgid "incline without highway"
-msgstr "inclinació sense via"
+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 "cruïlla sense via"
@@ -21024,8 +22241,8 @@ msgstr "carrils sense via"
msgid "lcn without highway"
msgstr "lcn sense via"
-msgid "lit without highway"
-msgstr "llum sense via"
+msgid "lit without highway/railway/piste/parking/platform"
+msgstr "lit sense highway/railway/piste/parking/platform"
msgid "living_street without highway"
msgstr "carrer residencial sense via"
@@ -21042,8 +22259,8 @@ msgstr "autopista sense via"
msgid "ntd_id without highway"
msgstr "ntd_id sense via"
-msgid "oneway without highway"
-msgstr "sentit únic sense via"
+msgid "oneway without highway or railway"
+msgstr "sentit únic sense via o via fèrria"
msgid "sac_scale without highway"
msgstr "escala sac sense via"
@@ -21129,50 +22346,161 @@ msgstr "tipus de via sense ferrocarril"
msgid "tracks without railway"
msgstr "vies sense ferrocarril"
-msgid "traffic_mode without railway"
-msgstr "mode de trànsit sense via fèrria"
+msgid "traffic_mode without railway"
+msgstr "mode de trànsit sense via fèrria"
+
+msgid "usage without railway"
+msgstr "utilització sense via fèrria"
+
+msgid "workrules without railway"
+msgstr "normes de treball sense via fèrria"
+
+msgid "stream without waterway"
+msgstr "rierol sense curs d''aigua"
+
+msgid "intermittent without waterway"
+msgstr "curs intermintent sense curs d''aigua"
+
+msgid "boat without waterway / natural=water"
+msgstr "vaixell sense curs d''aigua / aigua natural"
+
+msgid "length_unit without waterway"
+msgstr "unitat de mesura sense curs d''aigua"
+
+msgid "llid without waterway"
+msgstr "llid sense curs d''aigua"
+
+msgid "canal without waterway"
+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 "túnel sense highway/railway/waterway/platform/pipeline"
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr "pont sense highway/railway/waterway/platform/piste/pipeline"
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr "psv sense via/via fèrria/curs d''aigua/aparcament"
+
+msgid "width without physical linear feature"
+msgstr "amplada sense una característica física lineal"
+
+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 "usage without railway"
-msgstr "utilització sense via fèrria"
+msgid "source:ele without ele"
+msgstr "font:ele sense ele"
-msgid "workrules without railway"
-msgstr "normes de treball sense via fèrria"
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr "font:ref:INSEE sense ref:INSEE"
-msgid "stream without waterway"
-msgstr "rierol sense curs d''aigua"
+msgid "source:lit without lit"
+msgstr "font:lit sense lit"
-msgid "intermittent without waterway"
-msgstr "curs intermintent sense curs d''aigua"
+msgid "source:hgv without hgv"
+msgstr "font:hgv sense hgv"
-msgid "boat without waterway / natural=water"
-msgstr "vaixell sense curs d''aigua / aigua natural"
+msgid "source:outline on a node"
+msgstr "font:contorn sobre un node"
-msgid "length_unit without waterway"
-msgstr "unitat de mesura sense curs d''aigua"
+msgid "source:highway without highway"
+msgstr "font: via sense via"
-msgid "llid without waterway"
-msgstr "llid sense curs d''aigua"
+msgid "source:maxaxleload without maxaxleload"
+msgstr "font:pes màxim per eix sense pes màxim per eix"
-msgid "canal without waterway"
-msgstr "canal sense curs d''aigua"
+msgid "source:surface without surface"
+msgstr "font:superfíce sense superfície"
-msgid "have_riverbank without waterway"
-msgstr "banc fluvial sense curs d''aigua"
+msgid "source:bridge without bridge"
+msgstr "font:pont sense pont"
-msgid "tunnel without highway/railway/waterway"
-msgstr "túnel sense via/ferrocarril/curs d''aigua"
+msgid "source:old_name without old_name"
+msgstr "font:old_name sense old_name"
-msgid "bridge without highway/railway/waterway"
-msgstr "pont sese via/via fèrria/curs d''aigua"
+msgid "source:bicycle without bicycle"
+msgstr "font:bicicleta sense bicicleta"
-msgid "psv without highway/railway/waterway"
-msgstr "etiqueta psv (serveis públics) sense via/via fèrria/curs d''aigua"
+msgid "source:designation without designation"
+msgstr "font:designació sense designació"
-msgid "width without physical linear feature"
-msgstr "amplada sense una característica física lineal"
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr "font:[addr:]housenumber sense addr:housenumber"
-msgid "maxspeed without highway/railway/traffic_sign"
-msgstr "velocitat màxima sense via/ferrocarril/senyal de trànsit"
+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 "religió sense denominació"
@@ -21192,8 +22520,55 @@ msgstr ""
"manca l''indicatiu de llengua de la viqupèdia, utilitzeu "
"''wikipedia''=''llengua:article'' (p.ex: ''wikipedia''=''ca:Montseny''"
-msgid "unkown language prefix in wikipedia tag"
-msgstr "prefix de llengua desconegut a una etiqueta de tipus viquipèdia"
+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 ""
+"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"
@@ -21204,20 +22579,29 @@ 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 "Tracks GPS d''Copy text \t OpenStreetMap"
+
msgid "OpenStreetMap (Mapnik)"
msgstr "OpenStreetMap (Mapnik)"
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik Black & White)"
-msgid "Skobbler"
-msgstr "Skobbler"
+msgid "skobbler"
+msgstr "skobbler"
+
+msgid "skobbler heatmap"
+msgstr "skobbler heatmap"
msgid "skobbler heatmap"
msgstr "skobbler heatmap"
@@ -21235,10 +22619,10 @@ msgid "OpenStreetMap (German Style)"
msgstr "OpenStreetMap (estil alemany)"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr ""
+msgstr "Cambodja, Laos, Tailàndia, Vietnam bilingüe"
-msgid "2u"
-msgstr "2u"
+msgid "osmfr"
+msgstr "osmfr"
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI black-and-white 2.5m"
@@ -21246,6 +22630,9 @@ 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 (base map)"
@@ -21374,7 +22761,7 @@ msgid "Hike & Bike"
msgstr "Hike & Bike"
msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
+msgstr "OpenStreetMap (Llengua sòrab)"
msgid "OpenStreetMap (German Language)"
msgstr "OpenStreetMap (llengua alemanya)"
@@ -21394,6 +22781,32 @@ 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í)"
@@ -21425,10 +22838,10 @@ msgid "PCN 2008 - IT Lazio+Umbria"
msgstr "PCN 2008 - IT Lazio+Umbria"
msgid "USSR - Latvia"
-msgstr ""
+msgstr "URSS- Letònia"
msgid "50cm ortho - Latvia"
-msgstr ""
+msgstr "50cm orto - Letònia"
msgid "20cm ortho - Coastline"
msgstr "20cm ortho - Coastline"
@@ -21440,7 +22853,7 @@ msgid "Niger Delta Oct 2012 Landsat"
msgstr "Niger Delta Oct 2012 Landsat"
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr ""
+msgstr "Pangasinan/Bulacan (Filipines alta resolució)"
msgid "ScanEx IRS"
msgstr "ScanEx IRS"
@@ -21473,7 +22886,7 @@ msgid "Slovakia EEA CORINE 2006"
msgstr "Slovakia EEA CORINE 2006"
msgid "Slovakia Historic Maps"
-msgstr ""
+msgstr "Mapes històrics de Eslovàquia"
msgid "South Africa CD:NGI Aerial"
msgstr "South Africa CD:NGI Aerial"
@@ -21559,6 +22972,9 @@ 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 "Nous carrers creats per TIGER desalineats (TIGER 2013)"
+
msgid "OSM - Tiger Edited Map"
msgstr "OSM - Tiger Edited Map"
@@ -21604,6 +23020,39 @@ msgstr "OS Scottish Popular historic"
msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr "NLS - Bartholomew Half Inch, 1897-1907"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr "Plànols de ciutats OS, Cupar 1854 (NLS)"
+
+msgid "OSM Export"
+msgstr "Exporta OSM"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Exporta dades de trànsit a un fitxer SUMO"
+
+msgid "SUMO Export"
+msgstr "Exportació SUMO"
+
+msgid "Export"
+msgstr "Exporta"
+
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "refrescar la llista de ports"
+
+msgid "Configure"
+msgstr "Configura"
+
+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 "Columbus V-900 CSV Files"
msgstr "Columbus V-900 fitxers CSV"
@@ -21814,6 +23263,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"
@@ -21835,14 +23296,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}''."
@@ -22117,11 +23572,14 @@ 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 "Housenumber increment:"
-msgstr "Increment pel nombres de carrer:"
+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"
@@ -22334,8 +23792,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"
@@ -22714,15 +24172,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"
@@ -22917,6 +24366,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."
@@ -22937,12 +24389,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "alt"
-
-msgid "medium"
-msgstr "mitjà"
-
msgid "symbol"
msgstr "símbol"
@@ -23097,6 +24543,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:"
@@ -23117,6 +24568,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?"
@@ -23370,8 +24824,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."
@@ -23423,7 +24880,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"
@@ -23657,27 +25114,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"
@@ -24209,14 +25648,20 @@ msgid ""
"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."
+"trobeu la característica corresponent a la capa d''imatgeri i moveu-la "
+"segons convingui."
msgid "Deprecated by {0} on {1}"
msgstr "Marcat com a obsolet per {0} el {1}"
@@ -24310,6 +25755,10 @@ 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 "Descarregant un nou decalatge ..."
@@ -24845,9 +26294,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"
@@ -25587,9 +27063,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 "Process queue"
msgstr "Cua de procés"
@@ -25646,18 +27119,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"
@@ -26013,6 +27474,28 @@ 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 "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}?"
@@ -26169,6 +27652,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"
@@ -26491,9 +27979,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:"
@@ -26717,6 +28202,9 @@ 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 "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}"
@@ -26752,15 +28240,35 @@ 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 "senyals"
+msgid "Change Properties"
+msgstr "Canvia propietats"
+
msgid "Country preset:"
msgstr "Preconfiguracions del país:"
@@ -26875,9 +28383,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)"
@@ -27083,20 +28588,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 "Exporta"
+msgid "Select a map object"
+msgstr "Seleccioneu un objecte del mapa"
msgid "AutoSave LiveData"
msgstr "Desament automàtic de LiveData"
@@ -27323,6 +28828,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"
@@ -27362,6 +28964,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..."
@@ -27532,9 +29138,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:"
@@ -28682,9 +30285,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"
@@ -28994,9 +30594,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 87%
copy from i18n/po/ca.po
copy to i18n/po/ca at valencia.po
index d52296e..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-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-08-15 06:38+0000\n"
-"Last-Translator: jmontane <Unknown>\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-08-16 04:31+0000\n"
-"X-Generator: Launchpad (build 16723)\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"
@@ -48,7 +48,10 @@ 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}"
@@ -59,6 +62,9 @@ msgstr "INFORMACIÓ: {0}"
msgid "DEBUG: {0}"
msgstr "DEBUG: {0}"
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Inicialitzacions específiques de la plataforma"
@@ -111,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"
@@ -147,7 +153,7 @@ msgid "Info"
msgstr "Informació"
msgid "Readme"
-msgstr "Llegeix-me"
+msgstr "Llig-me"
msgid "Revision"
msgstr "Revisió"
@@ -165,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 "
@@ -199,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í"
@@ -214,14 +220,14 @@ 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"
@@ -230,7 +236,7 @@ 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"
@@ -245,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}"
@@ -267,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"
@@ -298,14 +300,17 @@ msgid "problem"
msgstr "problema"
msgid "previous"
-msgstr "enrere"
+msgstr "arrere"
msgid "next"
-msgstr "endavant"
+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}"
@@ -363,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"
@@ -448,7 +453,7 @@ 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 "
+"<html>Esta acció requerirà {0} peticions <br>de descàrrega. Voleu "
"<br>continuar?</html>"
msgid "Download data"
@@ -503,13 +508,13 @@ msgid "Duplicate"
msgstr "Duplica"
msgid "Duplicate selection by copy and immediate paste."
-msgstr "Dupliqueu la selecció copiant i enganxant-la 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"
@@ -540,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"
@@ -553,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)"
@@ -567,7 +575,7 @@ msgid "New offset"
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 "Ajusta el desplaçament de la imatge"
@@ -597,7 +605,7 @@ msgid "Overwrite"
msgstr "Sobreescriu"
msgid "Offset bookmark already exists. Overwrite?"
-msgstr "Ja existeix un preferit amb aquest nom. Voleu sobreescriure''l?"
+msgstr "Ja existeix un preferit amb este nom. Voleu sobreescriure''l?"
msgid "Advanced info"
msgstr "Informació avançada"
@@ -677,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"
@@ -697,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."
@@ -738,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 "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"
@@ -801,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 "
@@ -832,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"
@@ -850,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ó"
@@ -886,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?"
@@ -897,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"
@@ -939,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"
@@ -973,11 +982,11 @@ 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..."
@@ -988,10 +997,10 @@ msgid "Opening file ''{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"
@@ -1035,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.)"
@@ -1044,40 +1053,35 @@ msgid "Orthogonalize Shape"
msgstr "Normalitza la figura"
msgid "Move nodes so all angles are 90 or 180 degrees"
-msgstr "Mou 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 "Desfà 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"
@@ -1085,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."
@@ -1100,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 les etiquetes"
+msgstr "Apega les etiquetes"
msgid "Apply tags of contents of paste buffer to all selected items."
msgstr ""
@@ -1129,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"
@@ -1141,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"
@@ -1151,7 +1152,7 @@ msgstr "Neteja..."
msgid "Forget objects but do not delete them on server when uploading."
msgstr ""
-"Ignora els objectes en enviar però sense que siguin esborrats al servidor."
+"Ignora els objectes en enviar però sense que siguen esborrats al servidor."
msgid "Purge"
msgstr "Neteja"
@@ -1164,9 +1165,9 @@ msgid ""
"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 "
@@ -1176,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"
@@ -1234,10 +1235,10 @@ msgid "Reverse ways"
msgstr "Inverteix les vies"
msgid "Save"
-msgstr "Desa"
+msgstr "Guarda"
msgid "Save the current data."
-msgstr "Desa les dades actuals."
+msgstr "Guarda les dades actuals."
msgid "File {0} exists. Overwrite?"
msgstr "El fitxer {0} ja existeix. Voleu sobreescriure''l?"
@@ -1249,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"
@@ -1270,11 +1271,8 @@ msgstr "Carrega una sessió"
msgid "Load a session from file."
msgstr "Carrega una sessió d''un fitxer."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Fitxer de la sessió (*.jos, *.joz)"
-
msgid "Open session"
-msgstr "Obre una sessió"
+msgstr "Obri una sessió"
msgid "Loading session ''{0}''"
msgstr "Carregant sessió ''{0}''"
@@ -1288,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 "Desa la sessió actual en un fitxer nou."
+msgstr "Guarda la sessió actual en un fitxer nou."
msgid "Session file (archive) (*.joz)"
msgstr "Fitxer de sessió (arxiu) (*.joz)"
@@ -1303,7 +1301,7 @@ msgid "Session file (*.jos)"
msgstr "Fitxer de sessió (*.jos)"
msgid "Save session"
-msgstr "Desa la sessió..."
+msgstr "Guarda la sessió..."
msgid "<html>Could not save session file ''{0}''.<br>Error is:<br>{1}</html>"
msgstr ""
@@ -1311,16 +1309,16 @@ msgstr ""
"és:<br>{1}</html>"
msgid "Save Session"
-msgstr "Desa la sessió"
+msgstr "Guarda la sessió"
msgid "Save As"
-msgstr "Anomena i desa"
+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"
@@ -1426,20 +1424,20 @@ msgstr ""
"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"
@@ -1463,13 +1461,13 @@ msgid "Duplicate nodes that are used by multiple ways."
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ó"
@@ -1504,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"
@@ -1537,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"
@@ -1617,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"
@@ -1628,7 +1649,7 @@ 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 la selecció"
@@ -1703,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"
@@ -1712,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}"
@@ -1742,7 +1763,7 @@ msgstr "Avança"
msgctxt "audio"
msgid "Jump forward"
-msgstr "Salta endavant"
+msgstr "Salta avant"
msgctxt "audio"
msgid "Next Marker"
@@ -1809,13 +1830,13 @@ 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 "Detalls de la petició: {0}"
@@ -1842,6 +1863,9 @@ 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})"
@@ -1874,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>"
@@ -1943,19 +1967,19 @@ 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 un node nou."
@@ -2048,7 +2072,7 @@ 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 "Millora la precisió de les vies"
@@ -2060,7 +2084,7 @@ 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."
@@ -2089,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"
@@ -2118,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"
@@ -2173,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-"
@@ -2191,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"
@@ -2209,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"
@@ -2237,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"
@@ -2252,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ó"
@@ -2265,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ó"
@@ -2328,7 +2350,7 @@ msgid "replace selection"
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ó"
@@ -2349,7 +2371,7 @@ 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"
@@ -2496,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 ""
@@ -2574,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"
@@ -2665,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"
@@ -2786,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 "
@@ -2803,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"
@@ -2823,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 ..."
@@ -2855,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"
@@ -2870,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}"
@@ -2919,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"
@@ -2940,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"
@@ -3033,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?"
@@ -3069,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"
@@ -3123,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 "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ó"
@@ -3162,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"
@@ -3185,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}"
@@ -3222,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 "
@@ -3249,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 "
@@ -3262,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 "
@@ -3291,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}"
@@ -3324,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}''"
@@ -3399,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}"
@@ -3503,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."
@@ -3622,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)"
@@ -3667,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"
@@ -3711,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"
@@ -3737,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"
@@ -3747,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"
@@ -3765,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"
@@ -3799,12 +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ó."
+"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"
@@ -3846,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"
@@ -3862,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"
@@ -3886,11 +3931,20 @@ 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"
@@ -3933,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."
@@ -3957,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"
@@ -3975,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"
@@ -4004,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"
@@ -4014,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"
@@ -4022,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})"
@@ -4051,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"
@@ -4059,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}"
@@ -4147,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 "
@@ -4168,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"
@@ -4211,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"
@@ -4233,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"
@@ -4284,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}"
@@ -4317,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"
@@ -4343,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''"
@@ -4371,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"
@@ -4405,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"
@@ -4414,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ó)"
@@ -4537,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"
@@ -4600,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"
@@ -4622,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"
@@ -4634,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"
@@ -4647,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"
@@ -4662,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"
@@ -4680,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"
@@ -4691,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."
@@ -4735,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"
@@ -4784,6 +4822,18 @@ 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"
@@ -4791,7 +4841,7 @@ 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"
@@ -4800,7 +4850,7 @@ 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"
@@ -4853,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)"
@@ -4874,7 +4924,7 @@ msgid "Metric"
msgstr "Mètric"
msgid "Chinese"
-msgstr "Xinès"
+msgstr "Xinés"
msgid "Imperial"
msgstr "Imperial"
@@ -4891,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"
@@ -4923,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"
@@ -4970,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:"
@@ -5006,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 ""
@@ -5076,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"
@@ -5118,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)"
@@ -5134,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"
@@ -5184,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 ""
@@ -5198,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 ""
@@ -5223,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."
@@ -5230,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."
@@ -5237,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."
@@ -5252,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"
@@ -5268,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"
@@ -5301,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)"
@@ -5322,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"
@@ -5378,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"
@@ -5425,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"
@@ -5480,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"
@@ -5507,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?"
@@ -5522,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}''"
@@ -5553,7 +5595,7 @@ msgid "Conflicts in pasted tags"
msgstr "Conflictes a etiquetes enganxades"
msgid "Paste ..."
-msgstr "Enganxa ..."
+msgstr "Apega ..."
msgid "From ..."
msgstr "De..."
@@ -5581,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"
@@ -5615,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 "
@@ -5637,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 "
@@ -5653,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 "
@@ -5661,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"
@@ -5671,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"
@@ -5696,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"
@@ -5716,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}"
@@ -5738,7 +5776,7 @@ 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"
@@ -5748,8 +5786,8 @@ 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"
+"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"
@@ -5768,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."
@@ -5781,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"
@@ -5809,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>"
@@ -5847,7 +5885,7 @@ msgid "Filter mode"
msgstr "Mode filtre"
msgid "Add filter."
-msgstr "Afegeix filtre."
+msgstr "Afig filtre."
msgid "Edit filter."
msgstr "Modifica filtre"
@@ -6144,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}"
@@ -6183,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"
@@ -6201,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"
@@ -6219,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"
@@ -6252,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)"
@@ -6267,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ó"
@@ -6302,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"
@@ -6324,7 +6394,7 @@ msgid "Relations: {0}"
msgstr "Relacions: {0}"
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"
@@ -6351,7 +6421,7 @@ 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"
@@ -6359,8 +6429,8 @@ 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"
@@ -6382,7 +6452,7 @@ 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"
@@ -6390,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"
@@ -6421,7 +6490,7 @@ 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ó"
@@ -6482,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"
@@ -6530,7 +6599,7 @@ msgstr "buit"
msgctxt "changeset.state"
msgid "Open"
-msgstr "Obre"
+msgstr "Obri"
msgctxt "changeset.state"
msgid "Closed"
@@ -6546,7 +6615,7 @@ msgid "Comment"
msgstr "Comentari"
msgid "Open"
-msgstr "Obre"
+msgstr "Obri"
msgid "User"
msgstr "Usuari"
@@ -6579,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"
@@ -6618,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"
@@ -6668,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 "
@@ -6682,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"
@@ -6718,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"
@@ -6771,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"
@@ -6815,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"
@@ -6832,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"
@@ -6842,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"
@@ -6889,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 "
@@ -6903,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>"
@@ -6921,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 ""
@@ -6957,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"
@@ -6980,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"
@@ -6991,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 "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 "Properties/Memberships"
-msgstr "Propietats/Membres"
+msgid "Discardable key: selection Background"
+msgstr "Clau descartable: selecció en el fons"
-msgid "Properties for selected objects."
-msgstr "Propietats dels objectes seleccionats"
+msgid "Discardable key: foreground"
+msgstr "Clau descartable: selecció en primer pla"
+
+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ó"
@@ -7037,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 "Enganxa el valor"
+msgstr "Apega el valor"
msgid "Paste the value of the selected tag from clipboard"
-msgstr "Enganxa del porta-retalls el valor de l''etiqueta seleccionada"
+msgstr "Apega del porta-retalls el valor de l''etiqueta seleccionada"
msgid "Copy Value"
msgstr "Copia el valor"
@@ -7128,7 +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 "Usa l''anglès per etiquetar de forma predeterminada"
+msgstr "Usa l''anglés per etiquetar de forma predeterminada"
msgid "Add value?"
msgstr "Afegir el valor?"
@@ -7139,10 +7215,10 @@ 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 "Estableix el nombre de les etiquetes afegides recentment"
@@ -7152,7 +7228,7 @@ 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 "
+"Per favor, establiu el nombre de les etiquetes recentment afegides a "
"visualitzar"
msgid "Please enter integer number between 0 and {0}"
@@ -7165,7 +7241,7 @@ 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}"
@@ -7211,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"
@@ -7266,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"
@@ -7286,7 +7362,7 @@ msgid ""
"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>"
@@ -7305,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 "
@@ -7316,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"
@@ -7335,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ó"
@@ -7347,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"
@@ -7365,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"
@@ -7378,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."
@@ -7386,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"
@@ -7401,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>"
@@ -7409,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"
@@ -7422,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ó"
@@ -7439,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"
@@ -7471,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?"
@@ -7565,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"
@@ -7582,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ó"
@@ -7621,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"
@@ -7662,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>"
@@ -7689,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"
@@ -7707,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)"
@@ -7716,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, "
@@ -7743,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"
@@ -7826,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 "
@@ -7846,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"
@@ -7877,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."
@@ -7962,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}"
@@ -7990,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"
@@ -8074,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"
@@ -8100,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"
@@ -8114,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:"
@@ -8141,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"
@@ -8149,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:"
@@ -8174,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"
@@ -8195,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"
@@ -8211,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 "
@@ -8258,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"
@@ -8283,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 "
@@ -8295,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."
@@ -8303,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"
@@ -8316,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"
@@ -8332,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"
@@ -8425,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!"
@@ -8447,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 ""
@@ -8559,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 "
@@ -8575,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 ""
@@ -8588,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"
@@ -8603,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 ..."
@@ -8625,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"
@@ -8673,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>"
@@ -8747,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 ..."
@@ -8760,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>"
@@ -8780,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ó"
@@ -8808,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)"
@@ -8833,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 ""
@@ -8841,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:"
@@ -8923,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"
@@ -8937,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"
@@ -8956,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}"
@@ -8970,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"
@@ -9005,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."
@@ -9020,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 "
@@ -9030,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 ""
@@ -9091,7 +9190,7 @@ 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 ""
@@ -9126,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"
@@ -9180,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):"
@@ -9199,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"
@@ -9209,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"
@@ -9221,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>"
@@ -9324,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"
@@ -9356,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..."
@@ -9366,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}"
@@ -9377,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"
@@ -9436,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"
@@ -9497,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}"
@@ -9517,10 +9622,7 @@ 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"
@@ -9541,7 +9643,7 @@ 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"
@@ -9571,7 +9673,7 @@ 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"
+msgstr "Descarregar d''OSM al llarg d''este track"
msgid "Calculating Download Area"
msgstr "Calculant l''àrea a descarregar"
@@ -9583,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"
@@ -9629,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"
@@ -9693,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 "
@@ -9714,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}''..."
@@ -9741,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"
@@ -9761,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ó:"
@@ -9774,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"
@@ -9838,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>"
@@ -9850,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 "
@@ -9870,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 "
@@ -9905,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"
@@ -9917,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ó"
@@ -9926,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"
@@ -9949,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"
@@ -9963,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ó"
@@ -10002,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ó"
@@ -10035,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}''"
@@ -10046,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}''"
@@ -10152,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ó"
@@ -10175,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"
@@ -10199,13 +10296,13 @@ msgstr ""
"autorització al servidor OSM.<br><br>El testimoni d''autenticació és: </html>"
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"
@@ -10241,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"
@@ -10255,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>"
@@ -10269,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>"
@@ -10279,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 "
@@ -10287,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..."
@@ -10313,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."
@@ -10323,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."
@@ -10341,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..."
@@ -10368,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 ""
@@ -10385,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)"
@@ -10448,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 "
@@ -10467,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"
@@ -10488,14 +10585,14 @@ 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?"
@@ -10516,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 ""
@@ -10524,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"
@@ -10616,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"
@@ -10696,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."
@@ -10749,7 +10846,7 @@ 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"
@@ -10757,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"
@@ -10767,7 +10864,7 @@ msgid "Replace existing values"
msgstr "Reemplaçar els valors existents"
msgid "Open JOSM customization file"
-msgstr "Obre el fitxer de personalització de JOSM"
+msgstr "Obri el fitxer de personalització de JOSM"
msgid "Import log"
msgstr "Registre de la importació"
@@ -10777,9 +10874,9 @@ msgid ""
"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."
+"<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 "shortcut"
msgstr "drecera"
@@ -10810,12 +10907,12 @@ msgid "Load profile"
msgstr "Carrega un perfil"
msgid "Save {0} profile"
-msgstr "Desa el perfil {0}"
+msgstr "Guarda el perfil {0}"
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"
+"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"
@@ -10862,8 +10959,8 @@ msgstr "Afegir paràmetre"
msgid "Advanced Background: Changed"
msgstr "Fons avançat: canviat"
-msgid "Advanced Background: NonDefalut"
-msgstr "Fons avançat: SensePredeterminació"
+msgid "Advanced Background: NonDefault"
+msgstr ""
msgid "Current value is default."
msgstr "El valor per defecte és l''actual"
@@ -10873,8 +10970,8 @@ 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)."
+"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"
@@ -10923,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"
@@ -10934,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ó"
@@ -10961,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"
@@ -10995,8 +11095,15 @@ 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"
@@ -11055,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"
@@ -11093,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"
@@ -11135,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)"
@@ -11177,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 ""
@@ -11247,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"
@@ -11314,13 +11420,13 @@ 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"
+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"
@@ -11372,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"
@@ -11381,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"
@@ -11438,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:"
@@ -11457,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}"
@@ -11473,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"
@@ -11508,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:"
@@ -11561,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"
@@ -11589,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 "
@@ -11622,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ó:"
@@ -11636,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}''"
@@ -11670,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})"
@@ -11697,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):"
@@ -11707,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)"
@@ -11848,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"
@@ -11884,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}''"
@@ -11891,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"
@@ -11902,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>"
@@ -11923,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 ""
@@ -11932,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"
@@ -11951,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:"
@@ -11963,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."
@@ -11997,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"
@@ -12028,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:"
@@ -12050,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:"
@@ -12076,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"
@@ -12128,10 +12235,10 @@ 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 "Paste tags from buffer"
-msgstr "Enganxa etiquetes de la memòria intermèdia"
+msgstr "Apega etiquetes de la memòria intermèdia"
msgid "Use preset ''{0}'' of group ''{1}''"
msgstr "Utilitzar preconfiguració ''{0}'' del grup ''{1}''"
@@ -12159,8 +12266,8 @@ msgstr "Aplicar"
msgid "New relation"
msgstr "Nova relació"
-msgid "Change Properties"
-msgstr "Canvia propietats"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr "Requisit desconegut: {0}"
@@ -12169,7 +12276,7 @@ msgid "Illegal member expression: {0}"
msgstr "Expressió de membre incorrecta: {0}"
msgid "More information about this feature"
-msgstr "Més informació sobre aquesta funcionalitat"
+msgstr "Més informació sobre esta funcionalitat"
msgid "Available roles"
msgstr "Rols disponibles"
@@ -12187,10 +12294,10 @@ msgid "Optional Attributes:"
msgstr "Atributs Opcionals:"
msgid "Select auto-increment of {0} for this field"
-msgstr "Selecciona un increment automàtic de {0} per aquest camp"
+msgstr "Selecciona un increment automàtic de {0} per este camp"
msgid "Cancel auto-increment for this field"
-msgstr "Anul·la l''increment automàtic per aquest camp"
+msgstr "Anul·la l''increment automàtic per este camp"
msgid "{0}:"
msgstr "{0}:"
@@ -12248,9 +12355,6 @@ 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}: "
@@ -12264,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 (*.*)"
@@ -12288,25 +12402,78 @@ 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 "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 ""
@@ -12342,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 ""
@@ -12396,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..."
@@ -12474,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"
@@ -12498,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"
@@ -12533,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."
@@ -12548,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}."
@@ -12612,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}''"
@@ -12645,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!"
@@ -12655,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 "
@@ -12735,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"
@@ -12753,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 "
@@ -12807,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 ..."
@@ -12841,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 "
@@ -12876,7 +13015,7 @@ 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"
@@ -12940,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}."
@@ -13027,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"
@@ -13094,7 +13233,7 @@ 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 "<supressió de {0} objectes>"
@@ -13106,17 +13245,16 @@ msgid "Add tags to selected objects"
msgstr "Afegir etiquetes als objectes seleccionats"
msgid "Add selected tags"
-msgstr "Afegeix les etiquetes seleccionades"
+msgstr "Afig les etiquetes seleccionades"
msgid "Add all tags"
-msgstr "Afegeix totes les etiquetes"
+msgstr "Afig totes les etiquetes"
msgid "Add checked tags to selected objects"
-msgstr "Afegeix les etiquetes verificades als objectes seleccionats"
+msgstr "Afig 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"
+msgstr "Majúscula+Enter: Afig totes les etiquetes als objectes seleccionats"
msgid "Assume"
msgstr "Assumeix"
@@ -13128,7 +13266,7 @@ 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ó"
+msgstr "Accepta totes les etiquetes de {0} per esta sessió"
msgid "Load data from API"
msgstr "Carregar dades de l''API"
@@ -13137,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"
@@ -13154,16 +13292,14 @@ 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."
+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"
@@ -13207,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."
@@ -13243,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: "
@@ -13276,18 +13421,30 @@ 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 ""
-"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
-"0.1"
+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"
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}''."
@@ -13364,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}''"
@@ -13482,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?"
@@ -13494,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>"
@@ -13528,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 "
@@ -13538,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"
@@ -13566,30 +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 ""
-"Avís: ha fallat la instal·lació del connector ''{0}'' a partir del fitxer "
-"temporal ''{1}'' descarregat. {2}"
+"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}''"
@@ -13616,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"
@@ -13629,7 +13783,7 @@ 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}''"
@@ -13668,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 ""
@@ -13687,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}''"
@@ -13723,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"
@@ -13734,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."
@@ -13768,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.)"
@@ -13792,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 ""
@@ -13804,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."
@@ -13822,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."
@@ -13840,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 "
@@ -13860,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 "
@@ -13877,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 ""
@@ -13893,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 "
@@ -13913,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."
@@ -13931,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 "
@@ -13949,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."
@@ -13973,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 ""
@@ -13982,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 ""
@@ -14003,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"
@@ -14095,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>"
@@ -14121,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."
@@ -14131,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."
@@ -14142,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 ""
@@ -14161,31 +14328,72 @@ 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}"
+msgid "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}"
+"Ha fallat la gestió del fitxer zip ''{0}''. L''excepció ha estat: {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 ""
-"Avís: ha fallat l''accés al directori ''{0}'' per raons de seguretat. "
-"L''excepcióha estat: {1}"
+"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}''."
@@ -14206,7 +14414,7 @@ msgid "Value is too long (max {0} characters):"
msgstr "El valor és massa llarg (màx. {0} caràcters):"
msgid "Do you want to paste these tags?"
-msgstr "Voleu enganxar aquestes etiquetes?"
+msgstr "Voleu apegar estes etiquetes?"
msgid "Clear buffer"
msgstr "Neteja la memòria intermèdia"
@@ -14218,11 +14426,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> Ho sentim, No és possible d''enganxar etiquetes de la memòria "
+"<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 "
@@ -14279,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 "
@@ -14314,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 "
@@ -14328,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"
@@ -14511,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"
@@ -14526,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ó:"
@@ -14565,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 ""
@@ -14589,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 "
@@ -14621,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."
@@ -14642,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"
@@ -14660,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"
@@ -14676,7 +14904,7 @@ 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ó."
+"avisats quan algú tanque la seua sessió."
msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
@@ -14693,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"
@@ -14722,7 +14950,7 @@ 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 "
+"Este connector experimental permet al JOSM emmagatzemar les tessel·les en "
"fitxers de bases de dades, no en immensos directoris"
msgid ""
@@ -14744,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."
@@ -14781,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."
@@ -14805,7 +15033,7 @@ 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"
@@ -14838,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"
@@ -14878,33 +15106,36 @@ 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"
@@ -14930,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"
@@ -14942,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"
@@ -14958,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."
@@ -14985,15 +15213,20 @@ 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í."
+"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"
@@ -15007,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 "
@@ -15029,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 ""
@@ -15135,6 +15368,9 @@ msgstr "Terraplè"
msgid "Lit"
msgstr "Llum"
+msgid "Toll"
+msgstr "Peatge"
+
msgid "Motorway Link"
msgstr "Enllaç d''autopista"
@@ -15225,6 +15461,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)"
@@ -15243,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"
@@ -15258,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"
@@ -15285,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"
@@ -15306,9 +15583,6 @@ msgstr "Restriccions del mode de transport"
msgid "General Access"
msgstr "Accés general"
-msgid "destination"
-msgstr "destinació"
-
msgid "delivery"
msgstr "lliurament"
@@ -15318,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"
@@ -15372,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)"
@@ -15397,7 +15674,7 @@ msgid "both"
msgstr "ambdós"
msgid "forward"
-msgstr "endavant"
+msgstr "avant"
msgid "backward"
msgstr "enrera"
@@ -15456,6 +15733,9 @@ msgstr "Edita Pont"
msgid "viaduct"
msgstr "viaducte"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr "giratori"
@@ -15536,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"
@@ -15574,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"
@@ -15604,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"
@@ -15643,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"
@@ -15692,7 +15981,7 @@ msgid "Number"
msgstr "Nombre"
msgid "Exit to"
-msgstr "Surt per"
+msgstr "Ix per"
msgid "Services"
msgstr "Àrea de servei"
@@ -15712,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"
@@ -15733,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)"
@@ -15763,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"
@@ -15772,6 +16067,9 @@ msgstr "Cediu el pas"
msgid "Mini-roundabout"
msgstr "Minirotonda"
+msgid "Edit Mini-Roundabout"
+msgstr "Modifica mini-rotonda"
+
msgid "Direction"
msgstr "Direcció"
@@ -15781,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"
@@ -15817,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"
@@ -15860,7 +16152,13 @@ msgid "Edit Block"
msgstr "Edita bloc"
msgid "Allowed traffic:"
-msgstr "Trànsit permès:"
+msgstr "Trànsit permés:"
+
+msgid "Material"
+msgstr "Material"
+
+msgid "stone"
+msgstr "pedra"
msgid "Bollard"
msgstr "Bol·lard"
@@ -15877,6 +16175,9 @@ msgstr "ascendent"
msgid "removable"
msgstr "suprimible"
+msgid "plastic"
+msgstr "plàstic"
+
msgid "Cycle Barrier"
msgstr "Barrera ciclista"
@@ -15946,20 +16247,14 @@ msgstr "tela metàl·lica"
msgid "electric"
msgstr "elèctric"
-msgid "roundpole"
-msgstr "pals rodons"
+msgid "pole"
+msgstr "pal"
msgid "split_rail"
msgstr "divisió_de_ferrocarril"
-msgid "chain"
-msgstr "cadena"
-
-msgid "hedge"
-msgstr "bardissa"
-
-msgid "pole"
-msgstr "pal"
+msgid "wire"
+msgstr "fil metàl·lic"
msgid "Guard Rail"
msgstr "Guarda-rail"
@@ -15989,8 +16284,9 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr "Rasa"
+msgctxt "Barrier"
msgid "Edit Ditch"
-msgstr "Edita sèquia"
+msgstr "Modifica sèquia"
msgid "Kerb"
msgstr "Vorada"
@@ -15998,11 +16294,11 @@ msgstr "Vorada"
msgid "Edit Kerb"
msgstr "Modifica vorada"
-msgid "Entrance"
-msgstr "Entrada"
+msgid "Entrance (barrier opening)"
+msgstr "Accés (barrera oberta)"
-msgid "Edit Entrance"
-msgstr "Edita l''entrada"
+msgid "Edit Entrance (barrier opening)"
+msgstr "Modifica accés (barrera oberta)"
msgid "Gate"
msgstr "Porta"
@@ -16024,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"
@@ -16056,12 +16352,6 @@ msgstr "pas d''escletxa"
msgid "stepover"
msgstr "pas de graons"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "pedra"
-
msgid "Turnstile"
msgstr "Torn"
@@ -16122,12 +16412,21 @@ msgstr "Editar canal de drenatge"
msgid "Ditch"
msgstr "Sèquia"
+msgid "Edit Ditch"
+msgstr "Edita sèquia"
+
msgid "Stream"
msgstr "Riera / Torrent"
msgid "Edit Stream"
msgstr "Edita riera / torrent"
+msgid "Wadi"
+msgstr "uadi"
+
+msgid "Edit Wadi"
+msgstr "Modifica uadi"
+
msgid "Canal"
msgstr "Canal"
@@ -16167,9 +16466,6 @@ msgstr "Edita presa"
msgid "Groyne"
msgstr "Espigó"
-msgid "Edit Groyne"
-msgstr "Edita Espigó"
-
msgid "Breakwater"
msgstr "Escullera"
@@ -16203,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"
@@ -16284,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"
@@ -16371,8 +16687,8 @@ msgstr "turisme"
msgid "freight"
msgstr "noli"
-msgid "Service/Type"
-msgstr "Servei/Tipus"
+msgid "Service type"
+msgstr "Tipus de servei"
msgid "yard"
msgstr "iardes"
@@ -16395,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 in Hertz (Hz)"
+msgstr "Freqüència en hertz (Hz)"
-msgid "Frequency (Hz)"
-msgstr "Freqüència (Hz)"
+msgid "16.67"
+msgstr "16.67"
msgid "16.7"
msgstr "16.7"
@@ -16410,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"
@@ -16434,15 +16750,15 @@ msgstr "Edita metro lleuger"
msgid "Subway"
msgstr "Metro"
-msgid "Edit Tram"
-msgstr "Edita tramvia"
-
msgid "Edit Subway"
msgstr "Edita metro"
msgid "Tram"
msgstr "Tramvia"
+msgid "Edit Tram"
+msgstr "Edita tramvia"
+
msgid "Bus Guideway"
msgstr "Troleibús"
@@ -16464,6 +16780,9 @@ 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"
@@ -16476,18 +16795,32 @@ 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 "mig"
+msgstr "mitja"
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "complet"
+msgstr "completa"
+msgctxt "crossing:barrier"
msgid "double_half"
-msgstr "semibarreres"
+msgstr "doble mitja barrera"
msgid "Crossing"
msgstr "Cruïlla"
+msgid "Edit Crossing"
+msgstr "Modifica cruïlla"
+
msgid "Crossing type"
msgstr "Tipus de cruïlla"
@@ -16587,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"
@@ -16603,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"
@@ -16626,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)"
@@ -16659,9 +16988,6 @@ msgstr "Places d''aparcament"
msgid "Edit Parking space"
msgstr "Edita places d''aparcament"
-msgid "rooftop"
-msgstr "terrat"
-
msgid "Capacity"
msgstr "Capacitat"
@@ -16683,11 +17009,30 @@ 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"
@@ -16836,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"
@@ -16857,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"
@@ -16884,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ó"
@@ -16908,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"
@@ -16945,9 +17289,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Parts"
-
msgid "Clothes"
msgstr "Roba"
@@ -17075,7 +17416,7 @@ msgstr "verd"
msgctxt "color"
msgid "red"
-msgstr "vermell"
+msgstr "roig"
msgctxt "color"
msgid "blue"
@@ -17100,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)"
@@ -17109,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)"
@@ -17144,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"
@@ -17174,6 +17518,9 @@ msgstr "Funicular"
msgid "Ferry"
msgstr "Transbordador"
+msgid "Edit Platform"
+msgstr "Modifica andana"
+
msgid "Bench"
msgstr "Banc per seure"
@@ -17186,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)"
@@ -17198,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"
@@ -17213,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"
@@ -17237,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"
@@ -17293,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"
@@ -17347,6 +17691,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"
@@ -17369,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"
@@ -17496,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"
@@ -17573,17 +17917,14 @@ msgstr "Striptease"
msgid "Edit Stripclub"
msgstr "Modifica striptease"
-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 "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"
@@ -17597,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"
@@ -17612,6 +17959,9 @@ msgstr "carrer"
msgid "scheme"
msgstr "esquemàtic"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Àrea que es mostra"
@@ -17651,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"
@@ -17672,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"
@@ -17817,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ó"
@@ -17877,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à"
@@ -17889,6 +18254,9 @@ msgstr "metodista"
msgid "mormon"
msgstr "mormó"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ortodox"
@@ -17907,38 +18275,138 @@ 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"
@@ -18027,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"
@@ -18108,12 +18582,66 @@ msgstr "Veterinari"
msgid "Edit Veterinary"
msgstr "Edita Veterinari"
-msgid "Drinking water"
-msgstr "Aigua potable"
+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"
@@ -18123,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"
@@ -18132,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"
@@ -18184,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"
@@ -18211,21 +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 "plastic"
-msgstr "plàstic"
-
msgid "Amount of Seats"
msgstr "Quantitat de seients"
@@ -18260,18 +18812,24 @@ msgstr "Edita Base de caça"
msgid "Height"
msgstr "Alçada"
+msgctxt "height"
msgid "low"
msgstr "baix"
+msgctxt "height"
+msgid "half"
+msgstr "mitja"
+
+msgctxt "height"
+msgid "full"
+msgstr "alta"
+
msgid "Hide"
msgstr "Aguait"
msgid "Lock"
msgstr "Bloca"
-msgid "Drinking Water"
-msgstr "Aigua potable"
-
msgid "Edit Source of Potable Water"
msgstr "Modifica font d''aigua potable"
@@ -18303,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"
@@ -18340,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"
@@ -18484,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"
@@ -18544,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"
@@ -18600,7 +19223,7 @@ msgid "Skating"
msgstr "Patinatge"
msgid "Edit Skating"
-msgstr "Edita patinatge"
+msgstr "Modifica patinatge"
msgid "ice_rink"
msgstr "pista de gel"
@@ -18644,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"
@@ -18716,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"
@@ -18867,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"
@@ -18879,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"
@@ -19157,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 "GPS Signals"
+msgstr ""
+
+msgid "GLONASS Signals"
+msgstr ""
-msgid "water_level"
-msgstr "nivell_aigua"
+msgid "Galileo Signals"
+msgstr ""
-msgid "weather"
-msgstr "meteo"
+msgid "Radiation"
+msgstr ""
-msgid "Recording"
-msgstr "Enregistrament"
+msgid "Seismic Activity"
+msgstr ""
-msgid "manually"
-msgstr "manualment"
+msgid "Recording:"
+msgstr ""
-msgid "automated"
-msgstr "automatitzat"
+msgid "Automated"
+msgstr ""
-msgid "remote"
-msgstr "remot"
+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 "Vèrtex geodèsic"
@@ -19200,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"
@@ -19212,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"
@@ -19269,89 +20108,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 "pelton_turbine"
+msgstr "turbina Pelton"
+
+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 "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 "battery charging"
-msgstr "càrrega de bateries"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
-msgid "Power Station"
-msgstr "Central elèctrica"
+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 "Edit Power Station"
-msgstr "Edita central elèctrica"
+msgid "Output forms of energy:"
+msgstr "Formes d''energia produïda:"
msgid "Power Sub Station"
msgstr "Subestació elèctrica"
@@ -19362,6 +20306,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ó"
@@ -19377,6 +20336,9 @@ msgstr "Edita Torre elèctrica"
msgid "Tower reference"
msgstr "Torre de referència"
+msgid "steel"
+msgstr "acer"
+
msgid "Pole"
msgstr "Pal"
@@ -19395,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"
@@ -19508,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"
@@ -19523,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)"
@@ -19544,6 +20504,9 @@ msgstr "Mercat"
msgid "Edit Marketplace"
msgstr "Edita mercat"
+msgid "Organic"
+msgstr "Orgànica"
+
msgid "Greengrocer"
msgstr "Fruiteria"
@@ -19556,9 +20519,6 @@ msgstr "Venda directa de productes agraris"
msgid "Edit Farm Stand"
msgstr "Modifica venda directa de productes agraris"
-msgid "Organic"
-msgstr "Orgànica"
-
msgid "Edit Organic/Bio"
msgstr "Modificar botiga d''aliments ecològics"
@@ -19628,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"
@@ -19649,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"
@@ -19664,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"
@@ -19692,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"
@@ -19728,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"
@@ -19761,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"
@@ -19773,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"
@@ -19821,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"
@@ -20034,6 +21020,12 @@ msgstr "Pic"
msgid "Edit Peak"
msgstr "Edita Pic"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Glacera"
@@ -20073,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"
@@ -20100,15 +21101,6 @@ 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 "Prada"
@@ -20184,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"
@@ -20238,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"
@@ -20250,6 +21248,9 @@ msgstr "Cementiri"
msgid "Edit Graveyard"
msgstr "Edita Cementiri"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Cementiri"
@@ -20325,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"
@@ -20361,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ú)"
@@ -20521,7 +21561,7 @@ 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"
@@ -20529,20 +21569,49 @@ msgstr "Ruta genèrica"
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"
@@ -20589,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"
@@ -20625,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)"
@@ -20721,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"
@@ -20742,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"
@@ -20751,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"
@@ -20772,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"
@@ -20787,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"
@@ -20829,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"
@@ -20916,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"
@@ -20934,9 +22024,6 @@ msgstr "Poble/Ciutat"
msgid "One Way"
msgstr "Sentit Únic"
-msgid "Church"
-msgstr "Església"
-
msgid "Fuel Station"
msgstr "Benzinera"
@@ -20964,6 +22051,9 @@ 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 "Via no classificada sense nom"
@@ -21009,11 +22099,41 @@ 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 "incline without highway"
-msgstr "inclinació sense via"
+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 "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 "inclinació sense via o via fèrria"
msgid "junction without highway"
msgstr "cruïlla sense via"
@@ -21024,8 +22144,8 @@ msgstr "carrils sense via"
msgid "lcn without highway"
msgstr "lcn sense via"
-msgid "lit without highway"
-msgstr "llum sense via"
+msgid "lit without highway/railway/piste/parking/platform"
+msgstr ""
msgid "living_street without highway"
msgstr "carrer residencial sense via"
@@ -21042,8 +22162,8 @@ msgstr "autopista sense via"
msgid "ntd_id without highway"
msgstr "ntd_id sense via"
-msgid "oneway without highway"
-msgstr "sentit únic sense via"
+msgid "oneway without highway or railway"
+msgstr "sentit únic sense via o via fèrria"
msgid "sac_scale without highway"
msgstr "escala sac sense via"
@@ -21159,20 +22279,131 @@ msgstr "canal sense curs d''aigua"
msgid "have_riverbank without waterway"
msgstr "banc fluvial sense curs d''aigua"
-msgid "tunnel without highway/railway/waterway"
-msgstr "túnel sense via/ferrocarril/curs d''aigua"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
-msgid "bridge without highway/railway/waterway"
-msgstr "pont sese via/via fèrria/curs d''aigua"
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
-msgid "psv without highway/railway/waterway"
-msgstr "etiqueta psv (serveis públics) sense via/via fèrria/curs d''aigua"
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
msgid "width without physical linear feature"
msgstr "amplada sense una característica física lineal"
-msgid "maxspeed without highway/railway/traffic_sign"
-msgstr "velocitat màxima sense via/ferrocarril/senyal de trànsit"
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+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 "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 "religió sense denominació"
@@ -21192,8 +22423,47 @@ msgstr ""
"manca l''indicatiu de llengua de la viqupèdia, utilitzeu "
"''wikipedia''=''llengua:article'' (p.ex: ''wikipedia''=''ca:Montseny''"
-msgid "unkown language prefix in wikipedia tag"
-msgstr "prefix de llengua desconegut a una etiqueta de tipus viquipèdia"
+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 ""
+
+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"
@@ -21204,20 +22474,26 @@ msgstr "Yahoo Sat"
msgid "Bing Sat"
msgstr "Bing Sat"
+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 Black & White)"
-msgid "Skobbler"
-msgstr "Skobbler"
+msgid "skobbler"
+msgstr ""
msgid "skobbler heatmap"
msgstr "skobbler heatmap"
@@ -21235,10 +22511,10 @@ msgid "OpenStreetMap (German Style)"
msgstr "OpenStreetMap (estil alemany)"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr ""
+msgstr "Cambodja, Laos, Tailàndia, Vietnam bilingüe"
-msgid "2u"
-msgstr "2u"
+msgid "osmfr"
+msgstr ""
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI black-and-white 2.5m"
@@ -21246,6 +22522,9 @@ 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)"
@@ -21374,7 +22653,7 @@ msgid "Hike & Bike"
msgstr "Hike & Bike"
msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
+msgstr "OpenStreetMap (Llengua sòrab)"
msgid "OpenStreetMap (German Language)"
msgstr "OpenStreetMap (llengua alemanya)"
@@ -21394,6 +22673,32 @@ 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í)"
@@ -21425,10 +22730,10 @@ msgid "PCN 2008 - IT Lazio+Umbria"
msgstr "PCN 2008 - IT Lazio+Umbria"
msgid "USSR - Latvia"
-msgstr ""
+msgstr "URSS- Letònia"
msgid "50cm ortho - Latvia"
-msgstr ""
+msgstr "50cm orto - Letònia"
msgid "20cm ortho - Coastline"
msgstr "20cm ortho - Coastline"
@@ -21440,7 +22745,7 @@ msgid "Niger Delta Oct 2012 Landsat"
msgstr "Niger Delta Oct 2012 Landsat"
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr ""
+msgstr "Pangasinan/Bulacan (Filipines alta resolució)"
msgid "ScanEx IRS"
msgstr "ScanEx IRS"
@@ -21473,7 +22778,7 @@ msgid "Slovakia EEA CORINE 2006"
msgstr "Slovakia EEA CORINE 2006"
msgid "Slovakia Historic Maps"
-msgstr ""
+msgstr "Mapes històrics d'Eslovàquia"
msgid "South Africa CD:NGI Aerial"
msgstr "South Africa CD:NGI Aerial"
@@ -21559,6 +22864,9 @@ 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 "OSM - Tiger Edited Map"
msgstr "OSM - Tiger Edited Map"
@@ -21604,6 +22912,39 @@ msgstr "OS Scottish Popular historic"
msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr "NLS - Bartholomew Half Inch, 1897-1907"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid "OSM Export"
+msgstr "Exporta OSM"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Exporta dades de trànsit a un fitxer SUMO"
+
+msgid "SUMO Export"
+msgstr "Exportació SUMO"
+
+msgid "Export"
+msgstr "Exporta"
+
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "refrescar la llista de ports"
+
+msgid "Configure"
+msgstr "Configura"
+
+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 "Columbus V-900 CSV Files"
msgstr "Columbus V-900 fitxers CSV"
@@ -21635,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..."
@@ -21647,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"
@@ -21705,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 "
@@ -21764,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}"
@@ -21794,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"
@@ -21814,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"
@@ -21835,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}''."
@@ -21854,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"
@@ -21872,7 +23219,7 @@ msgid "Enter key mode"
msgstr "Escriu mode de clau"
msgid "Auto add tags"
-msgstr "Afegeix etiquetes automàticament"
+msgstr "Afig etiquetes automàticament"
msgid "Autosimplify"
msgstr "Autosimplifica"
@@ -21881,16 +23228,16 @@ 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 "Dibuixa només polígons tancats"
@@ -21902,21 +23249,21 @@ 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"
@@ -21926,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?"
@@ -21985,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"
@@ -22077,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."
@@ -22117,11 +23464,14 @@ 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 "Housenumber increment:"
-msgstr "Increment pel nombres de carrer:"
+msgid "House number increment:"
+msgstr ""
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
@@ -22171,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"
@@ -22194,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}"
@@ -22221,13 +23571,13 @@ 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"
@@ -22321,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"
@@ -22334,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"
@@ -22356,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"
@@ -22374,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 ""
@@ -22407,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"
@@ -22422,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"
@@ -22432,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"
@@ -22448,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 "
@@ -22479,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)"
@@ -22489,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 ""
@@ -22545,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"
@@ -22576,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"
@@ -22630,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"
@@ -22660,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"
@@ -22694,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"
@@ -22714,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"
@@ -22778,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"
@@ -22864,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."
@@ -22876,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."
@@ -22917,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."
@@ -22937,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"
@@ -22968,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 "
@@ -22979,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 ""
@@ -23094,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:"
@@ -23117,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?"
@@ -23138,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"
@@ -23160,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"
@@ -23185,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}"
@@ -23203,7 +24548,7 @@ 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 "Load layer from cache"
@@ -23211,7 +24556,7 @@ 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"
@@ -23225,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."
@@ -23241,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"
@@ -23260,7 +24605,7 @@ 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 "Preferències de l''Open Cadastre"
@@ -23275,10 +24620,10 @@ 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..."
-msgstr "Desa la imatge com..."
+msgstr "Guarda la imatge com..."
msgid "PNG files (*.png)"
msgstr "Fitxers PNG (*.png)"
@@ -23321,7 +24666,7 @@ msgid ""
"correctly. Retry please."
msgstr ""
"Ui! no s''han obtingut totes les coordenades\n"
-"correctsment. Si us plau torneu a provar."
+"correctsment. Per favor torneu a provar."
msgid "Enter cadastre east,north position"
msgstr "Indiqueu una posició del cadastre (coordenades est i nord)"
@@ -23370,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."
@@ -23403,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."
@@ -23423,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"
@@ -23438,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)"
@@ -23469,7 +24817,7 @@ 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"
@@ -23554,8 +24902,8 @@ 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ó"
+"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}:"
@@ -23593,7 +24941,7 @@ msgid "not logged in"
msgstr "no connectat"
msgid "User {0} has left"
-msgstr "L''usuari {0} ha sortit"
+msgstr "L''usuari {0} ha eixit"
msgid "User {0} is mapping nearby"
msgstr "L''usuari {0} està cartografiant a la rodalia"
@@ -23657,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"
@@ -23725,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"
@@ -23754,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."
@@ -23763,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"
@@ -23796,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}>"
@@ -23820,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!"
@@ -23880,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"
@@ -23937,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"
@@ -24086,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"
@@ -24117,7 +25447,7 @@ 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 "Capa de calibratge"
@@ -24138,7 +25468,7 @@ msgid "Are you sure this imagery offset is wrong?"
msgstr "Esteu segur que el decalatge de la imatgeria és dolent?"
msgid "Are you sure this calibration geometry is aligned badly?"
-msgstr "Esteu segur que aquesta geometria de calibratge està mal alineada?"
+msgstr "Esteu segur que esta geometria de calibratge està mal alineada?"
msgid "Warning: deprecation is basically irreversible!"
msgstr "Avís: l''obsolescència és irreversible!"
@@ -24150,13 +25480,13 @@ msgstr ""
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 "
+"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 ""
-"Si us plau, indiqueu la raó per la que voleu marcar aquest calibratge de "
+"Per favor, indiqueu la raó per la que voleu marcar este calibratge de "
"geometria com a obsolet"
msgid "Notifying the server of the deprecation..."
@@ -24171,7 +25501,7 @@ 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 "
+"No hi ha dades per la regió seleccionada. Per favor, ajusteu la capa de la "
"imatgeria i pujeu un decalatge."
msgid "Loading imagery offsets..."
@@ -24209,14 +25539,20 @@ msgid ""
"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."
+"trobeu la característica corresponent a la capa d''imatgeri i moveu-la "
+"segons convingui."
msgid "Deprecated by {0} on {1}"
msgstr "Marcat com a obsolet per {0} el {1}"
@@ -24228,10 +25564,10 @@ msgid "Offset Information"
msgstr "Informació de decalatge"
msgid "Report this offset"
-msgstr "Informa d''aquest decalatge"
+msgstr "Informa d''este decalatge"
msgid "You are to notify moderators of this offset. Why?"
-msgstr "Notificareu els moderadors d''aquest decalatge. Per què?"
+msgstr "Notificareu els moderadors d''este decalatge. Per què?"
msgid "Reporting the offset..."
msgstr "Informant del decalatge ..."
@@ -24246,7 +25582,7 @@ msgid "A calibration geometry of {0} nodes"
msgstr "Un calibratge d''imatgeria de {0} nodes"
msgid "Determined right here"
-msgstr "Determinat aquí"
+msgstr "Determinat ací"
msgid "Determined {0} away"
msgstr "Determinat {0} lluny"
@@ -24255,7 +25591,7 @@ msgid "Reason"
msgstr "Motiu"
msgid "This entry has been reported."
-msgstr "Aquest element ha estat informat"
+msgstr "Este element ha estat informat"
msgid "Server has rejected the request"
msgstr "El servidor ha refusat la consulta"
@@ -24264,7 +25600,7 @@ msgid "Unable to connect to the server"
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 "
@@ -24274,10 +25610,10 @@ msgstr ""
"calibratge) al servidor"
msgid "Store calibration geometry"
-msgstr "Desa la geometria de calibratge"
+msgstr "Guarda la geometria de calibratge"
msgid "Store imagery offset"
-msgstr "Desa el decalatge de la imatgeria"
+msgstr "Guarda el decalatge de la imatgeria"
msgid ""
"The selected object can be used as a calibration geometry. What do you "
@@ -24299,10 +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 "
-"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."
+"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 "
@@ -24310,6 +25646,10 @@ 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 "Descarregant un nou decalatge ..."
@@ -24324,17 +25664,16 @@ msgid "Adjust the position of the selected imagery layer"
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 "Inicia l''ajustament"
msgid "There are currently no imagery layer to adjust."
-msgstr ""
-"En aquest moment no hi ha cap capa d''imatgeria que pugui ser ajustada"
+msgstr "En este moment no hi ha cap capa d''imatgeria que puga ser ajustada"
msgid "No layers to adjust"
-msgstr "No hi ha capes que puguin ser ajustades"
+msgstr "No hi ha capes que puguen ser ajustades"
msgid "Normal"
msgstr "Normal"
@@ -24394,7 +25733,7 @@ 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"
+msgstr "Per favor, obriu o creeu una capa de dades abans d''importar"
msgid "InfoMode"
msgstr "InfoMode"
@@ -24413,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"
@@ -24430,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"
@@ -24445,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"
@@ -24469,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"
@@ -24487,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"
@@ -24518,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"
@@ -24534,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"
@@ -24791,7 +26130,7 @@ msgid "Continuously center the LiveGPS layer to current position."
msgstr "Centrar de manera contínua laq capa LiveGPS a la posició actual"
msgid "Open MapDust"
-msgstr "Obre MapDust"
+msgstr "Obri MapDust"
msgid "MapDust bug reports"
msgstr "Llistats de probelemes de MapDust"
@@ -24806,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 ""
@@ -24845,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 "
@@ -24884,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 "
@@ -24931,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 ""
@@ -24962,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"
@@ -25050,19 +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)."
+msgstr "Dividir estes dades per barris (admin_level=11)."
msgid "CSV files"
msgstr "Fitxers CSV"
@@ -25113,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"
@@ -25128,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 ""
@@ -25165,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 "
@@ -25184,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"
@@ -25204,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"
@@ -25220,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"
@@ -25288,7 +26651,7 @@ 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 !"
@@ -25328,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"
@@ -25336,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"
@@ -25344,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"
@@ -25352,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)"
@@ -25360,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"
@@ -25488,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."
@@ -25582,22 +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 "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"
@@ -25622,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"
@@ -25640,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"
@@ -25681,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!"
@@ -25708,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."
@@ -25779,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"
@@ -25847,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"
@@ -25898,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"
@@ -25940,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: "
@@ -26013,8 +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 "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..."
@@ -26041,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"
@@ -26066,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"
@@ -26169,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"
@@ -26209,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"
@@ -26269,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"
@@ -26314,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 "
@@ -26381,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"
@@ -26390,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"
@@ -26453,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"
@@ -26462,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"
@@ -26491,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"
@@ -26507,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"
@@ -26523,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"
@@ -26556,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"
@@ -26569,8 +27940,8 @@ 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ó"
@@ -26639,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ó"
@@ -26657,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"
@@ -26717,6 +28088,9 @@ 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}"
msgstr "Manca un objectiu de fusió per {0} amb l''ID {1}"
@@ -26739,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?"
@@ -26752,15 +28126,35 @@ 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 "senyals"
+msgid "Change Properties"
+msgstr "Canvia propietats"
+
msgid "Country preset:"
msgstr "Preconfiguracions del país:"
@@ -26843,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"
@@ -26875,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)"
@@ -26905,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"
@@ -26939,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"
@@ -26971,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"
@@ -27000,7 +28391,7 @@ 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"
@@ -27058,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."
@@ -27083,20 +28474,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 ""
-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"
-msgstr "Exporta"
+msgid "Select a map object"
+msgstr ""
msgid "AutoSave LiveData"
msgstr "Desament automàtic de LiveData"
@@ -27113,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"
@@ -27147,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"
@@ -27165,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"
@@ -27201,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."
@@ -27231,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)"
@@ -27323,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"
@@ -27340,7 +28820,8 @@ msgstr "Enregistrar el fitxer de signatures"
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..."
@@ -27362,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..."
@@ -27388,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"
@@ -27509,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"
@@ -27530,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:"
@@ -27606,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>"
@@ -27645,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"
@@ -27685,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:"
@@ -27729,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}''"
@@ -27754,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?"
@@ -27785,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"
@@ -27818,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>"
@@ -27826,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"
@@ -27850,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}''"
@@ -27862,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"
@@ -27897,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"
@@ -27982,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"
@@ -28038,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 ""
@@ -28054,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>."
@@ -28085,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"
@@ -28102,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."
@@ -28122,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."
@@ -28132,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 "
@@ -28164,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"
@@ -28195,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 "
@@ -28230,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."
@@ -28285,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"
@@ -28303,25 +29783,25 @@ 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 "Split Object"
@@ -28345,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."
@@ -28371,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ó"
@@ -28414,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"
@@ -28424,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"
@@ -28450,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 "
@@ -28497,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 "
@@ -28523,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."
@@ -28547,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."
@@ -28557,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 ""
@@ -28595,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"
@@ -28606,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"
@@ -28616,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}!"
@@ -28631,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]"
@@ -28645,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"
@@ -28655,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"
@@ -28682,14 +30162,11 @@ 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"
@@ -28707,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"
@@ -28716,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"
@@ -28743,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"
@@ -28783,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."
@@ -28893,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"
@@ -28911,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"
@@ -28937,7 +30414,7 @@ msgid ""
"coordinate)"
msgstr ""
"Feu doble clic sobre l''element per cercar l''objecte amb el nom de "
-"l''article (i centrar a les seves coordenades)"
+"l''article (i centrar a les seues coordenades)"
msgid "Available via WIWOSM server"
msgstr "Disponible a través del servidor WIWOSM"
@@ -28975,17 +30452,17 @@ 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"
+"Apega els articles de la Viquipèdia des del porta-retalls del sistema"
msgid "clipboard"
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"
@@ -28994,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"
@@ -29011,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 acca88d..eeb1263 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-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-08-21 16:02+0000\n"
-"Last-Translator: Lukáš Matějka <Unknown>\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-08-22 04:31+0000\n"
-"X-Generator: Launchpad (build 16734)\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,6 +50,9 @@ 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}"
@@ -57,10 +60,13 @@ msgid "INFO: {0}"
msgstr "INFO: {0}"
msgid "DEBUG: {0}"
-msgstr "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"
@@ -96,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 "
@@ -162,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 "
@@ -264,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"
@@ -303,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}"
@@ -359,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í"
@@ -548,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)"
@@ -672,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ů"
@@ -841,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í"
@@ -1050,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 "
@@ -1076,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>"
@@ -1257,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í"
@@ -1411,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í"
@@ -1525,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"
@@ -1817,6 +1835,9 @@ 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á"
@@ -2066,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."
@@ -2542,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"
@@ -2749,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 "
@@ -2847,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}"
@@ -2883,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"
@@ -2912,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}''"
@@ -3040,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}"
@@ -3113,11 +3140,9 @@ msgid "Reverse directional way."
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"
@@ -3146,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"
@@ -3171,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}"
@@ -3204,21 +3232,19 @@ 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 "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 "
@@ -3228,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 "
@@ -3241,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 "
@@ -3269,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}"
@@ -3302,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}''."
@@ -3475,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."
@@ -3590,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)"
@@ -3629,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"
@@ -3673,14 +3685,17 @@ 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 "Číslo domu bez ulice"
@@ -3697,6 +3712,15 @@ 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"
+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"
@@ -3758,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"
@@ -3845,6 +3872,15 @@ 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"
@@ -3920,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"
@@ -3980,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})"
@@ -4020,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}"
@@ -4162,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"
@@ -4241,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}"
@@ -4271,9 +4316,6 @@ msgstr "budova"
msgid "area"
msgstr "oblast"
-msgid "Unclosed way"
-msgstr "Neuzavřená cesta"
-
msgid "Unconnected ways"
msgstr "Nenapojené cesty"
@@ -4299,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''"
@@ -4365,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)"
@@ -4489,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 "Upozornenie: Nepodarilo sa čítať MOTD. Výnimka bola: {0}"
+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"
@@ -4733,6 +4756,18 @@ 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"
@@ -4839,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)"
@@ -5165,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."
@@ -5178,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."
@@ -5195,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"
@@ -5211,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"
@@ -5270,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"
@@ -5558,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 ""
@@ -5767,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"
@@ -6150,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"
@@ -6234,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"
@@ -6327,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 "
@@ -6504,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ů"
@@ -6832,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 ""
"Varovanie: neočakávané hodnota pre preferencie ''{0}'', dostal som ''{1}''. "
"Resetovanie pre východziu hodnotu."
@@ -6902,35 +6958,47 @@ msgstr ""
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"
@@ -6944,14 +7012,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)"
@@ -7115,9 +7183,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 ""
-"Upozornenie: Ignorujem výnimku, pretože úloha bola zrušená. Výnimka: {0}"
+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"
@@ -7461,6 +7528,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"
@@ -7605,21 +7691,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, "
@@ -7631,28 +7704,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"
@@ -7765,8 +7819,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é."
@@ -7872,6 +7926,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"
@@ -7980,7 +8037,7 @@ msgstr ""
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 ""
"Varovanie: chybná hlavička \"{0}\" nenastala žiadna zhoda s očakávaným vzorom"
@@ -8004,6 +8061,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:"
@@ -8072,8 +8135,7 @@ 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 ""
"Varovanie: neúspešné zapnutie Credential Dialog-u vždy hore. Zachytená "
"bezpečnostná výnimka."
@@ -8158,11 +8220,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 "
@@ -8178,9 +8238,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"
@@ -8436,12 +8495,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 "
@@ -8455,6 +8508,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"
@@ -8470,6 +8539,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"
@@ -8477,11 +8561,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í ..."
@@ -8620,9 +8702,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 již smazán. Přeskakuji objekt při nahrávání."
-msgid "Warning: {0}"
-msgstr "Varovanie: {0}"
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Nahrávám {0} objekt..."
@@ -8634,6 +8713,9 @@ msgid ""
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>"
@@ -8654,7 +8736,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 ""
"Varovanie: nečakaná hodnota kľúča ''{0}'' v preferenciách, dostal som ''{1}''"
@@ -8815,8 +8897,8 @@ msgstr "Nasledujúca značka"
msgid "Jump to next marker"
msgstr "Přejít na další značku"
-msgid "Previos marker"
-msgstr "Predchádzajúca značka"
+msgid "Previous marker"
+msgstr "Předchozí značka"
msgid "Jump to previous marker"
msgstr "Přejít na předchozí značku"
@@ -8848,9 +8930,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"
@@ -9226,9 +9307,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..."
@@ -9247,6 +9325,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"
@@ -9308,6 +9389,12 @@ 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"
@@ -9390,9 +9477,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 "Přizpůsobení kreslení záznamu"
@@ -9591,14 +9675,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 "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}"
@@ -9622,7 +9702,7 @@ 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 ""
"Upozornenie: nepodarilo sa spracovať Mappaint štýly z ''{0}''. Chyba bola: "
"{1}"
@@ -9635,8 +9715,7 @@ 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}"
@@ -9905,8 +9984,8 @@ 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 "Získavam OAuth žiadosť prístupu z ''{0}''"
@@ -10690,7 +10769,7 @@ msgstr "Přidat nastavení"
msgid "Advanced Background: Changed"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid "Advanced Background: NonDefault"
msgstr ""
msgid "Current value is default."
@@ -10758,6 +10837,9 @@ 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 "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr "Zvýrazniť cieľové cesty a body"
@@ -10816,6 +10898,11 @@ 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 ""
+
msgid "Options that affect drawing performance"
msgstr "Možnosti, ktoré ovplyvnia výkonnosť kreslenia"
@@ -11292,6 +11379,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"
@@ -11360,8 +11453,8 @@ 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 "Varovanie: Nemožno čítať zdroj predvolieb označovania: {0}"
+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"
@@ -11640,21 +11733,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"
@@ -11676,6 +11754,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}''"
@@ -11740,8 +11833,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 ""
"Varovanie: Nepodporovaná hodnota ''{1}'' v predvoľbe ''{0}'. Používa sa "
"základné overenie totožnosti (Basic Authentication)."
@@ -11752,7 +11845,7 @@ 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 ""
"Varovanie: nepodarilo sa získať prihlasovacie údaje pre OSM zo správcu "
"prihlasovacích údajov."
@@ -11760,18 +11853,23 @@ msgstr ""
msgid "Current credential manager is of type ''{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 ""
+
+msgid "Periodically check for new messages"
msgstr ""
"Varovanie: 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 "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
"Varovanie: 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 autorizačný prístup do správcu "
"prihlasovacích údajov"
@@ -11864,18 +11962,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 ""
@@ -11949,8 +12038,8 @@ msgstr "Aplikovat přednastavení"
msgid "New relation"
msgstr "Nová relace"
-msgid "Change Properties"
-msgstr "Změnit vlastnosti"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr "Neznámy žiadaný: {0}"
@@ -12038,9 +12127,6 @@ msgstr "Prednastavené úlohy prvkom, bez materských"
msgid "Preset sub element without parent"
msgstr "Prednastavený sub prvok bez materských"
-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}: "
@@ -12059,6 +12145,16 @@ msgstr "Zobrazit pouze aplikovatelné na výběr"
msgid "Search in tags"
msgstr "Hledat ve značkách (tags)"
+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 (*.*)"
@@ -12091,9 +12187,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 ""
@@ -12129,7 +12272,7 @@ 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 ""
"Upozornenie: Neplatná hodnota atribútu ''{0}'' z elementu ''{1}'' v "
@@ -12178,35 +12321,31 @@ 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 ""
"Varovanie: Neočakávaný parametre pre HTTP proxy server. Mám hostiteľa "
"''{0}'' a 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 ""
"Varovanie: Neočakávaný parameter pre SOCKS proxy. Dostal som hostiteľa "
"''{0}'' a 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 ""
"Chyba: Pripojenie k proxy ''{0}'' pre URI ''{1}'' zlyhalo. 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 "
@@ -12311,6 +12450,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}."
@@ -12326,12 +12468,20 @@ msgstr "Hledám soubory s obrázky"
msgid "No image files found."
msgstr "Nenalezeny žádné soubory s obrázky."
+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 ""
"Upozornenie: Nepodarilo sa otvoriť súbor s príponou ''{2}'' a súbor ''{3}'' "
"v zip súbore ''{0}''. Výnimka bola: {1}"
@@ -12419,8 +12569,8 @@ 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!"
@@ -12523,41 +12673,11 @@ msgstr "V souboru {0} nebyla nalezena žádná data."
msgid "Open OsmChange file"
msgstr "Otvoriť súbor OsmChange"
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "povinný atribut ''{0}'' chybí"
-
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 ""
-"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 ""
-"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 "
@@ -12571,8 +12691,8 @@ 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."
@@ -12602,12 +12722,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>"
@@ -12697,8 +12813,8 @@ msgstr ""
"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 ""
"VAROVANIE: Normalizuje sa hodnota vlastnosti \"version\" (verzia) prvku {0} "
"na {2}, API verzia je ''{3}''. Prijatá hodnota je {1}."
@@ -12909,7 +13025,7 @@ 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 "RemoteControl::Accepting connections on port {0}"
@@ -12957,6 +13073,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."
@@ -12989,20 +13114,20 @@ 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 "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 ""
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 ""
msgid ""
"Version ''{0}'' of meta data for gpx track layer is not supported. Expected: "
@@ -13023,6 +13148,15 @@ msgstr "Vrstva obsahuj neuložená data - uložit do souboru."
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 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"
@@ -13030,6 +13164,9 @@ 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}''."
@@ -13101,18 +13238,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}''"
@@ -13285,11 +13418,11 @@ msgstr[2] ""
msgid "Plugin update failed"
msgstr "Aktualizace pluginů selhala"
-msgid "Warning: failed to find plugin {0}"
-msgstr "Varovanie: nepodarilo sa nájsť plugin {0}"
+msgid "Failed to find plugin {0}"
+msgstr ""
-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 ""
msgid "Disable plugin"
msgstr "Zakázat plugin"
@@ -13303,26 +13436,25 @@ 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 ""
"Varovanie: Nepodarilo sa nainštalovať už stiahnutý plugin ''{0}''. "
"Vynechávam inštaláciu. JOSM stále 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 ""
"\"Varovanie: 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."
@@ -13399,8 +13531,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 ""
"Upozornenie: Nepodaril sa scan súboru ''{0}'' pre informácie o pluginoch. "
"Vynechávam."
@@ -13417,9 +13548,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 ""
"Varovanie: nepodarilo sa vytvoriť adresár pluginu ''{0}''. Nemožno stiahnuť "
"obsah pluginu z webu pluginu ''{1}''."
@@ -13901,16 +14047,12 @@ msgstr ""
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}"
+msgid "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}"
+"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 "{0}... [please type its number]"
msgstr "{0}… [zadejte prosím jeho číslo]"
@@ -13922,8 +14064,51 @@ msgstr ""
"Nepodarilo sa otvoriť URL. V súčasnej dobe neexistuje nastavenie platformy. "
"Prosím nastavte najskôr platformu."
-msgid "reserved"
-msgstr "rezervované"
+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}''."
msgstr ""
@@ -13959,8 +14144,22 @@ 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 "
@@ -14304,6 +14503,11 @@ 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 ""
@@ -14576,6 +14780,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."
@@ -14635,9 +14842,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 ""
@@ -14681,6 +14885,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"
@@ -14817,6 +15026,9 @@ msgstr "Násep"
msgid "Lit"
msgstr "Osvětlení"
+msgid "Toll"
+msgstr "Poplatek"
+
msgid "Motorway Link"
msgstr "Dálnice - nájezd, rampa, kolektor"
@@ -14907,6 +15119,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"
@@ -14925,11 +15181,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"
@@ -14940,6 +15196,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"
@@ -14967,18 +15226,12 @@ msgstr "kruhový objezd"
msgid "jughandle"
msgstr "prípojka"
-msgid "yes"
-msgstr "ano"
-
msgid "Road Restrictions"
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"
@@ -14988,9 +15241,6 @@ msgstr "Obmedzenia spôsobu prepravy"
msgid "General Access"
msgstr "Obecný přístup"
-msgid "destination"
-msgstr "dopravní obsluha"
-
msgid "delivery"
msgstr "zásobování"
@@ -15000,15 +15250,15 @@ msgstr "na povolení"
msgid "private"
msgstr "soukromý"
+msgid "customers"
+msgstr "zákazníci"
+
msgid "agricultural"
msgstr "zemědelská vozidla"
msgid "forestry"
msgstr "lestníctvo"
-msgid "no"
-msgstr "ne"
-
msgid "official"
msgstr "oficiálne určené"
@@ -15054,6 +15304,9 @@ 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)"
@@ -15138,6 +15391,9 @@ msgstr "Edituj most"
msgid "viaduct"
msgstr "viadukt"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr "otočný"
@@ -15255,20 +15511,29 @@ msgstr ""
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"
@@ -15285,11 +15550,11 @@ msgstr "Stezka pro koně"
msgid "Edit Bridleway"
msgstr "Upravit cestu pro koně"
-msgid "Cycle Lane"
-msgstr "Pruh pre cyklistov"
+msgid "Cycle Lane/Track"
+msgstr ""
-msgid "Edit Cycle Lane"
-msgstr "Upraviť pruh pre cyklistov"
+msgid "Edit Cycle Lane or Track"
+msgstr ""
msgid "Cycleway"
msgstr "Cyklostezka"
@@ -15324,8 +15589,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 ""
msgid "Highway"
msgstr "Hlavná cesta"
@@ -15393,12 +15658,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"
@@ -15414,15 +15685,6 @@ 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)"
@@ -15445,6 +15707,15 @@ 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"
@@ -15454,6 +15725,9 @@ msgstr "Odpočívadlo"
msgid "Mini-roundabout"
msgstr "Malý kruhový objezd"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Směr"
@@ -15463,11 +15737,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"
@@ -15499,9 +15770,6 @@ 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ě"
@@ -15544,6 +15812,12 @@ msgstr "Upraviť balvan"
msgid "Allowed traffic:"
msgstr "Povolený provoz:"
+msgid "Material"
+msgstr "Materiál"
+
+msgid "stone"
+msgstr "kámen"
+
msgid "Bollard"
msgstr "Sloupek"
@@ -15559,6 +15833,9 @@ msgstr "vysúvateľný"
msgid "removable"
msgstr "odstrániteľný"
+msgid "plastic"
+msgstr "plast"
+
msgid "Cycle Barrier"
msgstr "Zábrana proti kolům"
@@ -15628,20 +15905,14 @@ msgstr "pletivo"
msgid "electric"
msgstr "elektřina"
-msgid "roundpole"
-msgstr "drevené brvná (roundpole)"
+msgid "pole"
+msgstr "stožár"
msgid "split_rail"
msgstr "rozchod železnice"
-msgid "chain"
-msgstr "řetěz"
-
-msgid "hedge"
-msgstr "živý plot"
-
-msgid "pole"
-msgstr "stožár"
+msgid "wire"
+msgstr ""
msgid "Guard Rail"
msgstr "Zvodidlá"
@@ -15671,8 +15942,9 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr "Priekopa (ditch)"
+msgctxt "Barrier"
msgid "Edit Ditch"
-msgstr "Upravit strouhu"
+msgstr ""
msgid "Kerb"
msgstr "Obrubník"
@@ -15680,11 +15952,11 @@ msgstr "Obrubník"
msgid "Edit Kerb"
msgstr "Upraviť obrubník"
-msgid "Entrance"
-msgstr "Vstup"
+msgid "Entrance (barrier opening)"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Upravit vstup"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Brána"
@@ -15737,12 +16009,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr "Materiál"
-
-msgid "stone"
-msgstr "kámen"
-
msgid "Turnstile"
msgstr "Turniket"
@@ -15803,12 +16069,21 @@ msgstr "Upravit odvodňovací kanál, meliorace"
msgid "Ditch"
msgstr "Strouha"
+msgid "Edit Ditch"
+msgstr "Upravit strouhu"
+
msgid "Stream"
msgstr "Potok"
msgid "Edit Stream"
msgstr "Upravit potok"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Plavební kanál"
@@ -15848,9 +16123,6 @@ msgstr "Upravit přehradu"
msgid "Groyne"
msgstr "Vlnolam"
-msgid "Edit Groyne"
-msgstr "Upravit vlnolam"
-
msgid "Breakwater"
msgstr "Vlnolam"
@@ -15884,6 +16156,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š)"
@@ -15965,20 +16252,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"
@@ -16052,8 +16344,8 @@ msgstr "turistika"
msgid "freight"
msgstr "náklad"
-msgid "Service/Type"
-msgstr "Služba/Typ"
+msgid "Service type"
+msgstr ""
msgid "yard"
msgstr "seřazovací kolej"
@@ -16076,11 +16368,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"
@@ -16091,9 +16386,6 @@ msgstr "Úzkorozchodná železnice"
msgid "Edit Narrow Gauge Rail"
msgstr "Upravit úzkorozchodnou železnici"
-msgid "Types"
-msgstr "Typy"
-
msgid "Monorail"
msgstr "Jednokolejnicová dráha"
@@ -16145,6 +16437,9 @@ msgstr "Upraviť opustenú železnicu"
msgid "Level Crossing"
msgstr "Železniční přejezd"
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr "Hlídané"
@@ -16157,18 +16452,32 @@ 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 "střední"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "plná"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "double_half"
-msgstr "polovičná dvojitá"
+msgstr ""
msgid "Crossing"
msgstr "Železniční přechod pro chodce"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Druh křížení"
@@ -16268,13 +16577,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"
@@ -16284,13 +16591,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ě"
@@ -16307,12 +16612,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"
@@ -16340,9 +16645,6 @@ msgstr "Parkovací místo"
msgid "Edit Parking space"
msgstr "Upravit parkovací místo"
-msgid "rooftop"
-msgstr "zastrešené"
-
msgid "Capacity"
msgstr "Kapacita"
@@ -16364,17 +16666,36 @@ 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 "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 "Sa-Su 00:00-24:00"
+msgstr ""
-msgid "Parking entrance"
-msgstr "Vjezd na parkoviště"
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
-msgid "Edit Parking entrance"
-msgstr "Upravit vjezd na parkoviště"
+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 "Vjezd na parkoviště"
+
+msgid "Edit Parking entrance"
+msgstr "Upravit vjezd na parkoviště"
msgid "Fuel"
msgstr "Čerpací stanice"
@@ -16517,6 +16838,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"
@@ -16538,6 +16862,12 @@ msgstr "Opravna"
msgid "Edit Car Repair"
msgstr "Upravit autoopravnu"
+msgid "Parts"
+msgstr "Součástky"
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr "Pneuservis"
@@ -16565,6 +16895,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)"
@@ -16589,22 +16925,6 @@ 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"
@@ -16626,9 +16946,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Součástky"
-
msgid "Clothes"
msgstr "Oblečení"
@@ -16823,6 +17140,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"
@@ -16853,6 +17173,9 @@ msgstr "Pozemní lanovka"
msgid "Ferry"
msgstr "Trajekt/přívoz"
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Lavička"
@@ -16865,9 +17188,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í)"
@@ -16877,8 +17197,13 @@ msgstr "Železniční nástupiště (původní)"
msgid "funicular"
msgstr "pozemní lanovka"
+msgctxt "railway"
msgid "Station"
-msgstr "Stanica"
+msgstr "Vlaková stanice"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Upravit stanici"
msgid "Building"
msgstr "Budova"
@@ -16892,6 +17217,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"
@@ -16916,14 +17244,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"
@@ -16972,8 +17292,8 @@ 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ě"
@@ -17026,6 +17346,21 @@ 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"
@@ -17048,21 +17383,6 @@ msgstr "Upravit hotel"
msgid "Stars"
msgstr "Počet hvězdiček"
-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"
-
msgid "Smoking"
msgstr "Kuřáci"
@@ -17252,9 +17572,6 @@ msgstr "Striptízový klub"
msgid "Edit Stripclub"
msgstr "Upraviť striptízový klub"
-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 "Tourism"
msgstr "Turistika"
@@ -17276,9 +17593,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ů"
@@ -17291,6 +17614,9 @@ msgstr "ulice"
msgid "scheme"
msgstr "orientační"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Zobrazený areál"
@@ -17330,6 +17656,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"
@@ -17351,23 +17680,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"
@@ -17496,50 +17837,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í"
@@ -17556,6 +17891,12 @@ msgstr "katolické"
msgid "evangelical"
msgstr "evangelické"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "svědkové Jehovovi"
@@ -17568,6 +17909,9 @@ msgstr "metodistické"
msgid "mormon"
msgstr "mormonské"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "pravoslavné"
@@ -17584,108 +17928,208 @@ msgid "quaker"
msgstr "kvakerské"
msgid "roman_catholic"
-msgstr "rímskokatolícky"
+msgstr "římskokatolické"
-msgid "shia"
-msgstr "ší’itské"
+msgid "russian_orthodox"
+msgstr ""
-msgid "sunni"
-msgstr "sunnitské"
+msgid "seventh_day_adventist"
+msgstr ""
msgid "Service Times"
msgstr "Časy bohoslužeb"
-msgid "Su 10:00"
-msgstr "Ne 10:00"
+msgid "18:00"
+msgstr ""
-msgid "Su 10:30"
-msgstr "Ne 10:30"
+msgid "sunset,sunrise"
+msgstr ""
-msgid "Su 11:00"
-msgstr "Ne 11:00"
+msgid "Su 9:30,11:00"
+msgstr ""
-msgid "Opening Hours for visiting"
-msgstr "Otevírací doba pro návštěvníky"
+msgid "Sa,Su,PH 9:00"
+msgstr ""
-msgid "Recording Studio"
-msgstr "Nahrávací studio"
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
-msgid "Edit Studio"
-msgstr "Upravit nahrávací 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 "Veřejná budova"
+msgid "Edit Mosque"
+msgstr ""
-msgid "Edit Public Building"
-msgstr "Upravit veřejnou budovu"
+msgid "mosque"
+msgstr "mešita"
-msgid "Town hall"
-msgstr "Radnice"
+msgid "ibadi"
+msgstr ""
-msgid "Edit Town hall"
-msgstr "Upravit radnici"
+msgid "shia"
+msgstr "ší’itské"
-msgid "Community Centre"
-msgstr "Komunitní centrum"
+msgid "sunni"
+msgstr "sunnitské"
-msgid "Embassy"
-msgstr "Ambasáda"
+msgid "Synagogue"
+msgstr ""
-msgid "Edit Embassy"
-msgstr "Upravit ambasádu"
+msgid "Edit Synagogue"
+msgstr ""
-msgid "Courthouse"
-msgstr "Soud"
+msgid "synagogue"
+msgstr "synagoga"
-msgid "Edit Courthouse"
-msgstr "Upravit soud"
+msgid "conservative"
+msgstr ""
-msgid "Prison"
-msgstr "Vězení"
+msgid "reform"
+msgstr ""
-msgid "Edit Prison"
-msgstr "Upravit vězení"
+msgid "Buddhist Temple"
+msgstr ""
-msgid "Police"
-msgstr "Policie"
+msgid "Edit Buddhist Temple"
+msgstr ""
-msgid "Edit Police"
-msgstr "Upravit policii"
+msgid "theravada"
+msgstr ""
-msgid "Fire Station"
-msgstr "Hasičská stanice"
+msgid "mahayana"
+msgstr ""
-msgid "Edit Fire Station"
-msgstr "Upravit hasičskou stanici"
+msgid "vajrayana"
+msgstr ""
-msgid "Post Office"
-msgstr "Pošta"
+msgid "Hindu Temple"
+msgstr ""
-msgid "Edit Post Office"
-msgstr "Upravit poštu"
+msgid "Edit Hindu Temple"
+msgstr ""
-msgid "Education"
-msgstr "Vzdělání"
+msgid "vaishnavism"
+msgstr ""
-msgid "Kindergarten"
-msgstr "Mateřská škola"
+msgid "shaivism"
+msgstr ""
-msgid "Edit Kindergarten"
-msgstr "Upravit mateřskou školu"
+msgid "shaktism"
+msgstr ""
-msgid "School"
-msgstr "Základní škola"
+msgid "smartism"
+msgstr ""
-msgid "Edit School"
-msgstr "Upravit školu"
+msgid "Shinto Shrine"
+msgstr ""
-msgid "University"
+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"
+
+msgid "Edit Public Building"
+msgstr "Upravit veřejnou budovu"
+
+msgid "Town hall"
+msgstr "Radnice"
+
+msgid "Edit Town hall"
+msgstr "Upravit radnici"
+
+msgid "Community Centre"
+msgstr "Komunitní centrum"
+
+msgid "Embassy"
+msgstr "Ambasáda"
+
+msgid "Edit Embassy"
+msgstr "Upravit ambasádu"
+
+msgid "Courthouse"
+msgstr "Soud"
+
+msgid "Edit Courthouse"
+msgstr "Upravit soud"
+
+msgid "Prison"
+msgstr "Vězení"
+
+msgid "Edit Prison"
+msgstr "Upravit vězení"
+
+msgid "Police"
+msgstr "Policie"
+
+msgid "Edit Police"
+msgstr "Upravit policii"
+
+msgid "Fire Station"
+msgstr "Hasičská stanice"
+
+msgid "Edit Fire Station"
+msgstr "Upravit hasičskou stanici"
+
+msgid "Post Office"
+msgstr "Pošta"
+
+msgid "Edit Post Office"
+msgstr "Upravit poštu"
+
+msgid "Education"
+msgstr "Vzdělání"
+
+msgid "Kindergarten"
+msgstr "Mateřská škola"
+
+msgid "Edit Kindergarten"
+msgstr "Upravit mateřskou školu"
+
+msgid "School"
+msgstr "Základní škola"
+
+msgid "Edit School"
+msgstr "Upravit školu"
+
+msgid "University"
msgstr "Vysoká škola"
msgid "Edit University"
@@ -17706,6 +18150,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í"
@@ -17787,12 +18237,66 @@ msgstr "Veterinář"
msgid "Edit Veterinary"
msgstr "Upravit veterinární ordinaci"
-msgid "Drinking water"
-msgstr "Pitná voda"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr "veřejný"
+
+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"
@@ -17802,6 +18306,30 @@ 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"
@@ -17811,30 +18339,36 @@ msgstr "Upravit hodiny"
msgid "Display"
msgstr "Typ"
-msgctxt "display"
msgid "analog"
msgstr "analógové"
-msgctxt "display"
msgid "digital"
msgstr "digitálne"
-msgctxt "display"
msgid "sundial"
msgstr "slenečné"
-msgctxt "display"
msgid "unorthodox"
msgstr "neortodoxný"
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"
@@ -17863,8 +18397,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"
@@ -17890,21 +18424,15 @@ msgstr "stredisko"
msgid "Waste Basket"
msgstr "Odpadkový koš"
-msgid "Edit Waste Basket"
-msgstr "Upravit odpadkový koš"
-
msgid "Waste Disposal"
msgstr "Odpadkový kôš"
-msgid "Edit Waste Disposal"
-msgstr "Upraviť Nakladanie s odpadmi"
+msgid "Edit Bench"
+msgstr ""
msgid "Backrest"
msgstr "Opěrka zad"
-msgid "plastic"
-msgstr "plast"
-
msgid "Amount of Seats"
msgstr "Počet sedadel"
@@ -17939,8 +18467,17 @@ msgstr "Upravit posed"
msgid "Height"
msgstr "Výška"
+msgctxt "height"
msgid "low"
-msgstr "nízká"
+msgstr ""
+
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
msgid "Hide"
msgstr "Úkryt"
@@ -17948,9 +18485,6 @@ msgstr "Úkryt"
msgid "Lock"
msgstr "Uzamknutelný"
-msgid "Drinking Water"
-msgstr "Pitná voda"
-
msgid "Edit Source of Potable Water"
msgstr "Upraviť zdroj pitnej vody"
@@ -17982,6 +18516,9 @@ msgstr "rybník"
msgid "Diameter (in mm)"
msgstr "Priemer (v mm)"
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr "ochranné okolie"
@@ -18019,119 +18556,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"
@@ -18163,26 +18736,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 ""
@@ -18190,6 +18764,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"
@@ -18223,6 +18806,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ů"
@@ -18279,7 +18878,7 @@ msgid "Skating"
msgstr "Bruslení"
msgid "Edit Skating"
-msgstr "Upravit bruslení"
+msgstr ""
msgid "ice_rink"
msgstr "zimný štadión"
@@ -18323,36 +18922,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 "Bez dozoru"
+msgctxt "piste:grooming"
msgid "classic"
msgstr "klasický"
+msgctxt "piste:grooming"
msgid "mogul"
msgstr "jazda v bubnoch (moguls)"
+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 "backcountry"
@@ -18395,19 +19012,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr "Americký futbal"
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -18546,6 +19159,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"
@@ -18558,38 +19183,73 @@ msgstr "Inženýrské objekty"
msgid "Edit Building"
msgstr "Upravit budovu"
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr "strecha"
+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 "úrad"
+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"
@@ -18597,21 +19257,60 @@ msgstr "Obytná budova"
msgid "Edit Residential Building"
msgstr "Upravit obytnou budovu"
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr "apartmány (byty)"
+msgctxt "building"
msgid "house"
-msgstr "dům"
+msgstr ""
+msgctxt "building"
msgid "hut"
msgstr "chata"
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr "radová zástavba"
+msgctxt "building"
msgid "detached"
msgstr "samota"
+msgid "Entrance"
+msgstr "Vstup"
+
+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ěž"
@@ -18836,66 +19535,182 @@ msgstr "Doba provozu"
msgid "Mo-Fr 22:00-05:00"
msgstr "Po-Pi 22:00-05:00"
-msgid "Measurement Station"
-msgstr "Měřící stanice"
+msgid "Monitoring Station"
+msgstr ""
-msgid "Edit Measurement Station"
-msgstr "Upravit měřící stanici"
+msgid "Edit Monitoring Station"
+msgstr ""
-msgid "Measurement"
-msgstr "Měření"
+msgid "Monitoring:"
+msgstr ""
+
+msgid "Weather"
+msgstr ""
+
+msgid "Water level"
+msgstr ""
-msgid "particulate_matter"
-msgstr "častice"
+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 "GPS Signals"
+msgstr ""
-msgid "Recording"
-msgstr "Záznam"
+msgid "GLONASS Signals"
+msgstr ""
-msgid "manually"
-msgstr "ruční"
+msgid "Galileo Signals"
+msgstr ""
-msgid "automated"
-msgstr "automatický"
+msgid "Radiation"
+msgstr ""
-msgid "remote"
-msgstr "vzdálený"
+msgid "Seismic Activity"
+msgstr ""
-msgctxt "display"
-msgid "no"
-msgstr "nie"
+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 "Triangulační bod"
-msgid "Edit Survey Point"
-msgstr "Upravit triangulační bod"
+msgid "Edit Survey Point"
+msgstr "Upravit triangulační bod"
+
+msgid "Surveillance Camera"
+msgstr ""
+
+msgid "Edit Surveillance Camera"
+msgstr "Upravit sledovací kameru"
+
+msgid "indoor"
+msgstr "vnitřní"
+
+msgid "outdoor"
+msgstr "venkovní"
+
+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 "Surveillance"
-msgstr "Sledovací kamera"
+msgid "hot air"
+msgstr "horúci vzduch"
-msgid "Edit Surveillance Camera"
-msgstr "Upravit sledovací kameru"
+msgid "cold water"
+msgstr "studená voda"
-msgid "indoor"
-msgstr "vnitřní"
+msgid "cold air"
+msgstr "studený vzduch"
-msgid "outdoor"
-msgstr "venkovní"
+msgid "compressed air"
+msgstr "stlačený vzduch"
-msgid "public"
-msgstr "veřejný"
+msgid "steam"
+msgstr "para"
-msgid "Power"
-msgstr "Energie"
+msgid "vacuum"
+msgstr "vysávač"
msgid "Power Generator"
msgstr "Elektrárna"
@@ -18948,89 +19763,192 @@ msgstr "větrná"
msgid "Method"
msgstr "Metóda (spôsob výroby)"
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr "anaeróbne vyhnívanie"
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
-msgstr "spalování"
+msgstr ""
-msgid "dam"
-msgstr "priehrada"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
+msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr "štiepenie"
+msgctxt "generator method"
msgid "fusion"
msgstr "fúzia"
+msgctxt "generator method"
msgid "gasification"
msgstr "splyňovanie"
-msgid "photovoltaic"
-msgstr "fotovoltaická"
-
-msgid "pumped-storage"
-msgstr "prečerpávacia"
+msgid "biomass / waste"
+msgstr ""
-msgid "pumping"
-msgstr "čerpacia"
+msgctxt "generator method"
+msgid "photovoltaic"
+msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr "tepelný rozklad"
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr "vodná"
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
-msgstr "tepelná"
+msgstr ""
-msgid "Output forms of energy"
-msgstr "Výstupné formy energie"
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr ""
-msgid "electricity"
-msgstr "elektrina"
+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 "horúca voda"
+msgid "gas_turbine"
+msgstr ""
-msgid "hot air"
-msgstr "horúci vzduch"
+msgid "biogas, biomass, gas, waste combustion"
+msgstr ""
-msgid "cold water"
-msgstr "studená voda"
+msgid "heat_pump"
+msgstr ""
-msgid "cold air"
-msgstr "studený vzduch"
+msgid "horizontal_axis"
+msgstr ""
-msgid "compressed air"
-msgstr "stlačený vzduch"
+msgid "tidal steam / wind"
+msgstr ""
-msgid "steam"
-msgstr "para"
+msgid "kaplan_turbine"
+msgstr ""
-msgid "vacuum"
-msgstr "vysávač"
+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 "battery charging"
-msgstr "nabíjanie batérie"
+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 "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"
@@ -19041,6 +19959,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říň"
@@ -19056,6 +19989,9 @@ msgstr "Upravit stožár elektrického vedení"
msgid "Tower reference"
msgstr "Označenie veže"
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr "Sloup"
@@ -19074,13 +20010,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ů"
@@ -19187,11 +20121,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í"
@@ -19202,8 +20136,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"
@@ -19223,6 +20157,9 @@ 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í"
@@ -19235,9 +20172,6 @@ msgstr "Stánok farmy"
msgid "Edit Farm Stand"
msgstr "Upraviť stánok farmy"
-msgid "Organic"
-msgstr "Obchod se zdravou výživou"
-
msgid "Edit Organic/Bio"
msgstr "Upraviť bio produkty"
@@ -19307,8 +20241,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"
@@ -19328,14 +20262,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"
@@ -19343,9 +20277,8 @@ msgstr "Hifi"
msgid "Edit Hifi Shop"
msgstr "Upravit obchod s hifi"
-msgctxt "shop"
msgid "Video"
-msgstr "Obchod s DVD"
+msgstr "Videopůjčovna/prodejna"
msgid "Edit Video Shop"
msgstr "Upravit videopůjčovnu/prodejnu"
@@ -19371,6 +20304,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"
@@ -19407,11 +20346,32 @@ msgstr "Zlatnictví"
msgid "Edit Jewelry"
msgstr "Upravit zlatnictví"
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+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"
-msgstr "Upravit sexshop"
+msgid "Edit Erotic Shop"
+msgstr ""
msgid "Florist"
msgstr "Květinářství"
@@ -19440,8 +20400,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"
@@ -19452,19 +20412,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"
@@ -19500,8 +20460,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"
@@ -19713,6 +20673,12 @@ msgstr "Vrchol"
msgid "Edit Peak"
msgstr "Upravit vrchol"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Ledovec"
@@ -19752,26 +20718,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 "ihličnatý"
+msgstr "jehličnatý"
-msgctxt "wood"
msgid "deciduous"
msgstr "listnatý"
-msgctxt "wood"
msgid "mixed"
-msgstr "zmiešaný"
+msgstr "smíšený"
msgid "Forest"
msgstr "Les"
@@ -19779,15 +20754,6 @@ 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 "Lúka"
@@ -19863,6 +20829,12 @@ msgstr "Louka"
msgid "Edit Meadow Landuse"
msgstr "Upravit louku"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Vinice"
@@ -19917,8 +20889,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"
@@ -19929,6 +20901,9 @@ msgstr "Malý hřbitov"
msgid "Edit Graveyard"
msgstr "Upravit malý hřbitov"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Hřbitov"
@@ -20004,6 +20979,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"
@@ -20040,6 +21042,18 @@ msgstr "sudé"
msgid "alphabetic"
msgstr "abecední"
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr "Kontakt (spoločné schéma)"
@@ -20208,20 +21222,49 @@ msgstr "Všeobecná trasa"
msgid "Edit general route"
msgstr "Upraviť všeobecnú trasu"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+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"
@@ -20268,20 +21311,23 @@ 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"
@@ -20304,8 +21350,8 @@ msgstr "niečo vzťahujúce sa k ulici"
msgid "Destination sign"
msgstr "Smerovník"
-msgid "Edit Destination sign"
-msgstr "Upraviť smerovník"
+msgid "Edit Destination Sign"
+msgstr ""
msgid "Destination written on sign (w/o distance)"
msgstr "Cieľ vyznačený na smerovníku (bez vzdialenosti)"
@@ -20400,18 +21446,27 @@ msgstr "cesty prechádzajúce pod mostom"
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
-msgstr "body tvoriace obrys"
+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"
msgstr "most"
msgid "deprecated"
msgstr "zastaralý"
+msgid "bicycle"
+msgstr "bicykl"
+
+msgid "foot"
+msgstr "pěší"
+
msgid "horse"
msgstr "koňská"
@@ -20421,8 +21476,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"
@@ -20430,11 +21488,11 @@ msgstr "služby"
msgid "ford"
msgstr "brod"
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
-msgstr "miesto pohotovostnej prvej pomoci"
+msgid "emergency.access.point"
+msgstr ""
msgid "riverbank"
msgstr "říční břeh"
@@ -20451,6 +21509,9 @@ msgstr "peřeje"
msgid "railwaypoint"
msgstr "železničná výhybka"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr "koľajisko"
@@ -20466,29 +21527,29 @@ msgstr "historická železnica (turistická)"
msgid "aeroway"
msgstr "letecké cesty"
-msgid "aeroway_dark"
-msgstr "letecká cesta tmavá"
+msgid "aeroway.dark"
+msgstr ""
-msgid "aeroway_light"
-msgstr "letecká cesta svetlá"
+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"
@@ -20508,20 +21569,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"
@@ -20595,11 +21656,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"
@@ -20613,9 +21677,6 @@ msgstr "Vesnice/Město"
msgid "One Way"
msgstr "Jednosměrka"
-msgid "Church"
-msgstr "Kostel"
-
msgid "Fuel Station"
msgstr "Čerpací stanice"
@@ -20643,6 +21704,9 @@ 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 "nepomenovaná neklasifikovaná cesta"
@@ -20688,11 +21752,41 @@ msgstr "nezvyčajná kombinácia značiek (highway a waterway)"
msgid "unusual tag combination (highway & natural)"
msgstr "nezvyčajná kombinácia značiek (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 "značka \"natural=water\" použitá pre plavecký bazén"
-msgid "incline without highway"
-msgstr "\"incline\" bez \"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"
msgstr "\"junction\" bez \"highway\""
@@ -20703,8 +21797,8 @@ msgstr "\"lanes\" bez \"highway\""
msgid "lcn without highway"
msgstr "\"lcn\" bez \"highway\""
-msgid "lit without highway"
-msgstr "\"lit\" bez \"highway\""
+msgid "lit without highway/railway/piste/parking/platform"
+msgstr ""
msgid "living_street without highway"
msgstr "\"living_street\" bez \"highway\""
@@ -20721,8 +21815,8 @@ msgstr "\"motorroad\" bez \"highway\""
msgid "ntd_id without highway"
msgstr "\"ntd_id\" bez \"highway\""
-msgid "oneway without highway"
-msgstr "\"oneway\" bez \"highway\""
+msgid "oneway without highway or railway"
+msgstr ""
msgid "sac_scale without highway"
msgstr "\"sac_scale\" bez \"highway\""
@@ -20838,20 +21932,132 @@ msgstr "\"canal\" bez \"waterway\""
msgid "have_riverbank without waterway"
msgstr "\"have_riverbank\" bez \"waterway\""
-msgid "tunnel without highway/railway/waterway"
-msgstr "\"tunnel\" bez \"highway/railway/waterway\""
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
-msgid "bridge without highway/railway/waterway"
-msgstr "\"bridge\" bez \"highway/railway/waterway\""
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
-msgid "psv without highway/railway/waterway"
-msgstr "\"psv\" bez \"highway/railway/waterway\""
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
msgid "width without physical linear feature"
msgstr "\"width\" bez fyzickej cesty"
-msgid "maxspeed without highway/railway/traffic_sign"
-msgstr "\"maxspeed\" bez \"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 ""
+"nezadaný jazyk pre wikipediu, použite \"wikipedia=jazyk:názov stránky\""
+
+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\" bez \"denomination\""
@@ -20870,8 +22076,47 @@ msgid ""
msgstr ""
"nezadaný jazyk pre wikipediu, použite \"wikipedia=jazyk:názov stránky\""
-msgid "unkown language prefix in wikipedia tag"
-msgstr "neznáma predpona jazyka v značke \"wikipedia\""
+msgid "unknown language prefix in wikipedia tag"
+msgstr ""
+
+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 "Landsat"
msgstr "Landsat"
@@ -20882,20 +22127,26 @@ msgstr "Yahoo Sat"
msgid "Bing Sat"
msgstr "Bing Sat"
+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 Čiernobiely)"
-msgid "Skobbler"
-msgstr "Skobbler"
+msgid "skobbler"
+msgstr ""
msgid "skobbler heatmap"
msgstr "skobbler heatmap"
@@ -20915,8 +22166,8 @@ msgstr "OpenStreetMap (Nemecký štýl)"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgid "2u"
-msgstr "2u"
+msgid "osmfr"
+msgstr ""
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI black-and-white 2.5m"
@@ -20924,6 +22175,9 @@ 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)"
@@ -21026,21 +22280,68 @@ 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 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 ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
-msgstr "Toulouse - Orthophotoplan 2007"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
-msgstr "Tours - Orthophotos 2008-2010"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
-msgid "Tours - Orthophotos 2008"
-msgstr "Tours - Orthophotos 2008"
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
-msgid ""
-"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
-"- 1 m"
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
msgstr ""
"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
"- 1 m"
@@ -21075,6 +22376,14 @@ msgstr "Stuttgart (Luftbild)"
msgid "Imagerie Drone (Haiti)"
msgstr "Imagerie Drone (Haiti)"
+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"
@@ -21237,6 +22546,9 @@ 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 "OSM - Tiger Edited Map"
msgstr "OSM - Tiger Edited Map"
@@ -21282,6 +22594,39 @@ msgstr "OS Scottish Popular historic"
msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr "NLS - Bartholomew Half Inch, 1897-1907"
+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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "obnovit seznam portů"
+
+msgid "Configure"
+msgstr "Nastavit"
+
+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 "Columbus V-900 CSV Files"
msgstr "CSV soubory Columbus V-900"
@@ -21490,6 +22835,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."
@@ -21511,14 +22868,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}''."
@@ -21784,10 +23135,13 @@ 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 "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -21993,8 +23347,8 @@ 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"
-msgstr "Očakávané platné číslo prírastka čísla adresy"
+msgid "Expected valid number for increment"
+msgstr ""
msgid "Country code must be 2 letters"
msgstr "Kód země musí mít 2 písmena"
@@ -22270,15 +23624,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 ""
@@ -22466,6 +23811,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr "Použít \"Tableau d''assemblage\""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr "Zvoľte najprv WMS vrstvu v zozname."
@@ -22484,12 +23832,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr "symbol"
@@ -22636,6 +23978,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:"
@@ -22656,6 +24001,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 "Přidat \"source=...\" k objektům?"
@@ -22903,8 +24251,11 @@ 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ý."
@@ -22956,8 +24307,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"
@@ -23182,27 +24533,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í."
@@ -24305,9 +25638,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>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"
@@ -24960,9 +26317,6 @@ 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 "Process queue"
msgstr "Proces poradia"
@@ -25019,18 +26373,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 ""
@@ -25379,6 +26721,27 @@ msgstr "Test selhal: nelze přečíst čas modifikace."
msgid "Test failed: Could not write mtime."
msgstr "Test selhal: nelze zapsat čas modifikace."
+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 ""
@@ -25530,6 +26893,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 ""
@@ -25847,9 +27214,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr "Stopy"
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -26065,6 +27429,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 "Chýba zlučovaný cieľ pre {0} s id {1}"
@@ -26097,15 +27464,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 ""
+"Upozornenie: Nepodporovaný začiatočný prvok ''{0}'' v obsahu zmenového "
+"súboru na pozícii ({1},{2}). Vynechávam."
+
+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 "Prednastavenie krajiny:"
@@ -26220,9 +27607,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)"
@@ -26403,19 +27787,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"
@@ -26633,6 +28017,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"
@@ -26669,6 +28142,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..."
@@ -26821,9 +28298,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 ""
@@ -27913,9 +29387,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"
@@ -28205,9 +29676,6 @@ msgstr "Nastaví štandardný jazyk pre články Wikipedie"
msgid "Enter the Wikipedia language"
msgstr "Zadajte jazyk Wikipedie"
-msgid "Add Tag"
-msgstr "Pridať značku"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/cy.po b/i18n/po/cy.po
index 0097d6b..8163d55 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-08-04 03:41+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-08-05 05:05+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -60,6 +63,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -160,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 ""
@@ -251,9 +257,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -290,6 +293,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -344,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 ""
@@ -524,6 +530,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -637,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 ""
@@ -787,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"
@@ -973,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 ""
@@ -996,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>"
@@ -1164,9 +1166,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1305,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"
@@ -1400,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 ""
@@ -1684,6 +1704,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1903,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] ""
@@ -2329,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 ""
@@ -2525,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 ""
@@ -2612,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 ""
@@ -2648,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"
@@ -2674,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}''"
@@ -2779,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] ""
@@ -2839,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"
@@ -2870,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"
@@ -2894,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 ""
@@ -2924,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 ""
@@ -2944,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 ""
@@ -2953,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 ""
@@ -2973,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}"
@@ -3004,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}''."
@@ -3161,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 ""
@@ -3269,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 ""
@@ -3307,9 +3337,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3348,6 +3375,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3372,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 ""
@@ -3431,6 +3470,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3513,6 +3555,15 @@ 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 ""
@@ -3582,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 ""
@@ -3639,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})"
@@ -3677,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}"
@@ -3814,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"
@@ -3889,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 ""
@@ -3919,9 +3979,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3946,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''"
@@ -4012,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 ""
@@ -4132,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"
@@ -4361,6 +4401,18 @@ 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 ""
@@ -4465,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 ""
@@ -4765,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 "> 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"
@@ -4802,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"
@@ -4854,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 ""
@@ -5111,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 ""
@@ -5639,6 +5688,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5722,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 ""
@@ -5812,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 ""
@@ -5983,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 ""
@@ -6270,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"
@@ -6336,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"
@@ -6378,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)"
@@ -6538,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"
@@ -6856,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 ""
@@ -6987,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 ""
@@ -7011,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 ""
@@ -7124,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."
@@ -7223,6 +7302,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7310,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"
@@ -7329,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 ""
@@ -7395,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"
@@ -7471,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 ""
@@ -7486,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"
@@ -7702,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 "
@@ -7716,13 +7796,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7731,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 ""
@@ -7738,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 ..."
@@ -7851,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] ""
@@ -7863,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>"
@@ -7879,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:"
@@ -8025,7 +8136,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8055,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"
@@ -8408,9 +8519,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8429,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 ""
@@ -8486,6 +8597,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8552,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 ""
@@ -8735,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}''..."
@@ -8757,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"
@@ -8767,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:"
@@ -8988,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}''"
@@ -9703,6 +9812,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9771,6 +9913,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9824,6 +9969,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 ""
@@ -10280,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 ""
@@ -10343,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 ""
@@ -10601,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}''"
@@ -10687,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:"
@@ -10697,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 ""
@@ -10792,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"
@@ -10872,7 +11027,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10951,9 +11106,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10972,6 +11124,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 ""
@@ -11001,9 +11161,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 ""
@@ -11034,7 +11234,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 ""
@@ -11074,28 +11274,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..."
@@ -11190,6 +11388,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11205,12 +11406,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}."
@@ -11289,7 +11498,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11388,35 +11597,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 ""
@@ -11426,8 +11611,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 ..."
@@ -11454,10 +11639,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>"
@@ -11541,8 +11723,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,7 +11921,7 @@ 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}"
@@ -11785,6 +11967,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."
@@ -11815,19 +12006,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 ""
@@ -11849,11 +12040,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 ""
@@ -11923,13 +12126,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}''"
@@ -12072,10 +12275,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"
@@ -12090,22 +12293,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}''"
@@ -12174,8 +12376,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..."
@@ -12190,9 +12391,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}''"
@@ -12514,12 +12730,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12530,30 +12745,73 @@ 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 "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] ""
+
+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"
@@ -12564,9 +12822,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."
@@ -12889,6 +13161,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 ""
@@ -13128,6 +13405,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."
@@ -13177,9 +13457,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 ""
@@ -13216,6 +13493,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 ""
@@ -13346,6 +13628,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13436,6 +13721,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 ""
@@ -13454,10 +13783,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13469,6 +13798,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13496,18 +13828,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 ""
@@ -13517,9 +13843,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13529,13 +13852,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13583,6 +13906,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13667,6 +13993,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13771,21 +14100,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 ""
@@ -13801,10 +14139,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"
@@ -13840,7 +14178,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13909,12 +14247,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 ""
@@ -13930,15 +14274,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 ""
@@ -13960,6 +14295,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13969,6 +14313,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13978,10 +14325,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14014,9 +14358,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14059,6 +14400,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14074,6 +14421,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14143,19 +14493,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14186,6 +14530,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14195,10 +14540,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14252,12 +14597,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14318,12 +14657,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14363,9 +14711,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14399,6 +14744,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 ""
@@ -14480,18 +14840,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 ""
@@ -14567,7 +14932,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14591,10 +14956,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"
@@ -14606,9 +14974,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14660,6 +15025,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14672,6 +15040,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14783,11 +15186,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14799,11 +15200,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14822,10 +15221,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14855,9 +15254,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14879,10 +15275,29 @@ 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"
@@ -15032,6 +15447,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15053,6 +15471,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15080,6 +15504,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15104,22 +15534,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 ""
@@ -15141,9 +15555,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15338,6 +15749,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15368,6 +15782,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15380,9 +15797,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15392,9 +15806,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15407,6 +15826,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15431,14 +15853,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15487,7 +15901,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15541,41 +15955,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"
@@ -15767,9 +16181,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15791,9 +16202,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15806,6 +16223,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15845,6 +16265,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15866,22 +16289,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"
@@ -16011,49 +16446,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"
@@ -16071,6 +16500,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16083,6 +16518,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16101,37 +16539,137 @@ 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"
@@ -16221,6 +16759,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 ""
@@ -16302,128 +16846,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16454,16 +17076,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16497,6 +17125,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16534,117 +17165,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 ""
@@ -16678,33 +17345,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 ""
@@ -16738,6 +17415,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 ""
@@ -16838,36 +17531,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 ""
@@ -16910,19 +17621,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 ""
@@ -17061,6 +17768,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 ""
@@ -17073,60 +17792,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 ""
@@ -17351,41 +18144,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"
@@ -17394,7 +18213,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17406,12 +18225,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 ""
@@ -17463,88 +18372,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17556,6 +18568,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 ""
@@ -17571,6 +18598,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17589,11 +18619,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17702,10 +18730,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17717,7 +18745,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17738,6 +18766,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17750,9 +18781,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17822,7 +18850,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17843,13 +18871,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"
@@ -17858,7 +18886,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17886,6 +18913,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17922,10 +18955,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"
@@ -17955,7 +19009,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17967,19 +19021,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"
@@ -18015,7 +19069,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18228,6 +19282,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18267,24 +19327,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 ""
@@ -18294,15 +19363,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18378,6 +19438,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18432,7 +19498,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18444,6 +19510,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18480,43 +19549,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18555,6 +19651,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18723,21 +19831,50 @@ 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 ""
+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 ""
@@ -18783,19 +19920,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"
@@ -18819,7 +19959,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18915,18 +20055,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 ""
@@ -18936,7 +20085,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18945,10 +20097,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18966,6 +20118,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18981,28 +20136,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"
@@ -19023,19 +20178,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"
@@ -19110,10 +20265,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19128,9 +20286,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19158,6 +20313,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19203,10 +20361,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"
@@ -19218,7 +20406,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"
@@ -19236,7 +20424,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19353,19 +20541,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 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"
@@ -19384,7 +20683,46 @@ 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 "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 "Landsat"
@@ -19396,19 +20734,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 "skobbler heatmap"
@@ -19429,7 +20776,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19438,6 +20785,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19584,6 +20934,29 @@ 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 ""
@@ -19749,6 +21122,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19794,6 +21170,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19980,19 +21389,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20016,13 +21437,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20285,10 +21700,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20492,7 +21910,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"
@@ -20763,15 +22181,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20942,6 +22351,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 ""
@@ -20960,12 +22372,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21101,6 +22507,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 ""
@@ -21118,6 +22527,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 ""
@@ -21344,7 +22756,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."
@@ -21394,7 +22809,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21579,6 +22994,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21618,27 +23098,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 ""
@@ -22716,9 +24178,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 ""
@@ -23365,9 +24844,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23420,18 +24896,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 ""
@@ -23778,6 +25242,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23929,6 +25414,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 ""
@@ -24246,9 +25734,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24464,6 +25949,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 ""
@@ -24496,15 +25984,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 ""
@@ -24619,9 +26123,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24800,19 +26301,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"
@@ -25028,6 +26529,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 ""
@@ -25064,6 +26654,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..."
@@ -25216,9 +26809,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26204,9 +27794,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26485,9 +28072,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 1424595..45722d7 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-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-08-14 13:12+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-08-15 04:31+0000\n"
-"X-Generator: Launchpad (build 16723)\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,9 @@ 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}"
@@ -60,6 +63,9 @@ msgstr "INFO: {0}"
msgid "DEBUG: {0}"
msgstr "DEBUG: {0}"
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Afvikler platforms opstartskrog"
@@ -163,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 "
@@ -265,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"
@@ -304,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}"
@@ -360,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"
@@ -547,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)"
@@ -668,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"
@@ -836,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"
@@ -1041,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 "
@@ -1070,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>"
@@ -1252,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"
@@ -1402,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"
@@ -1513,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"
@@ -1808,6 +1828,9 @@ 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)"
@@ -2048,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"
@@ -2527,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"
@@ -2739,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 "
@@ -2837,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}"
@@ -2873,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"
@@ -2901,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}''"
@@ -3021,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"
@@ -3087,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"
@@ -3120,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"
@@ -3145,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}"
@@ -3178,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 "
@@ -3202,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 "
@@ -3215,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 "
@@ -3243,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}"
@@ -3277,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}\"."
@@ -3452,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."
@@ -3567,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)"
@@ -3609,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"
@@ -3652,6 +3672,9 @@ msgstr "validering andet"
msgid "Running test {0}"
msgstr "Kører test {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Adresser"
@@ -3676,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"
@@ -3737,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"
@@ -3825,6 +3860,15 @@ 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"
@@ -3897,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"
@@ -3957,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})"
@@ -3999,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}"
@@ -4143,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"
@@ -4218,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}"
@@ -4248,9 +4301,6 @@ msgstr "bygning"
msgid "area"
msgstr "område"
-msgid "Unclosed way"
-msgstr "Uafsluttet vej"
-
msgid "Unconnected ways"
msgstr "Uforbundne veje"
@@ -4277,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\""
@@ -4345,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)"
@@ -4467,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"
@@ -4710,6 +4741,18 @@ 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"
@@ -4816,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)"
@@ -5144,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."
@@ -5151,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."
@@ -5158,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."
@@ -5177,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"
@@ -5193,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"
@@ -5249,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"
@@ -5529,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 "
@@ -6125,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"
@@ -6208,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"
@@ -6298,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 "
@@ -6476,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"
@@ -6806,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"
@@ -6878,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"
@@ -6920,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)"
@@ -7086,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"
@@ -7437,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"
@@ -7586,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, "
@@ -7612,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"
@@ -7744,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."
@@ -7849,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"
@@ -7957,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"
@@ -7981,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"
@@ -8049,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"
@@ -8135,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 "
@@ -8156,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"
@@ -8395,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 "
@@ -8415,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"
@@ -8431,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"
@@ -8438,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 ..."
@@ -8579,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..."
@@ -8592,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>"
@@ -8612,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:"
@@ -8765,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"
@@ -8798,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"
@@ -9174,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..."
@@ -9195,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"
@@ -9254,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"
@@ -9336,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"
@@ -9537,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}''..."
@@ -9565,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."
@@ -9576,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:"
@@ -9847,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}''"
@@ -10634,6 +10710,40 @@ 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"
+
+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: NonDefalut"
msgstr "Avanceret baggrund:: Ikke-standard"
@@ -10705,6 +10815,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"
@@ -10765,6 +10878,11 @@ 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"
@@ -11246,6 +11364,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"
@@ -11312,8 +11436,8 @@ 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 "Advarsel: Kunne ikke indlæse kilde med prædefinerede tags: {0}"
+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"
@@ -11595,21 +11719,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"
@@ -11631,6 +11740,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}''"
@@ -11696,8 +11820,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:"
@@ -11706,21 +11830,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 ""
@@ -11809,18 +11937,9 @@ 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 "Genvej baggrund: Bruger"
@@ -11892,8 +12011,8 @@ msgstr "Anvend prædefinition"
msgid "New relation"
msgstr "Ny relation"
-msgid "Change Properties"
-msgstr "Ret egenskaber"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr "Ukendt krav: {0}"
@@ -11956,11 +12075,11 @@ msgstr ""
msgid "Unknown type: {0}"
msgstr "Ukendt type: {0}"
-msgid "Preset group {1} / {0}"
-msgstr "Prædefinitionsgruppe {1} / {0}"
+msgid "Could not read tagging preset source: {0}"
+msgstr "Kunne ikke læse kilde med prædefinerede tags: {0}"
-msgid "Preset group {0}"
-msgstr "Prædefinitionsgruppe {0}"
+msgid "Error parsing {0}: "
+msgstr "Fejl ved fortolkning af {0}: "
msgid "Roles cannot appear more than once"
msgstr "Roller kan ikke optræde mere end én gang"
@@ -11971,9 +12090,6 @@ msgstr "Prædefineret rolleelement uden forælder"
msgid "Preset sub element without parent"
msgstr "Prædefineret under-element uden forælder"
-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}: "
@@ -11992,6 +12108,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(*.*)"
@@ -12027,9 +12153,56 @@ 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 ""
+"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 "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 ""
@@ -12066,11 +12239,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."
@@ -12111,40 +12282,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..."
@@ -12246,6 +12404,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}."
@@ -12261,15 +12422,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}."
@@ -12353,8 +12520,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!"
@@ -12458,45 +12625,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 "
@@ -12506,11 +12641,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 ..."
@@ -12538,11 +12671,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 ""
@@ -12632,11 +12762,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}."
@@ -12840,8 +12968,14 @@ 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 "RemoteControl::Accepting connections on port {0}"
msgstr "Fjernstyring::Accepterer forbindelser på port {0}"
@@ -12887,6 +13021,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."
@@ -12923,20 +13066,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: "
@@ -12961,6 +13104,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"
@@ -12968,6 +13120,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}\"."
@@ -13042,18 +13197,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}\""
@@ -13223,11 +13374,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."
@@ -13241,30 +13392,24 @@ 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 ""
"Advarsel: kunne ikke installere udvidelsen ''{0}'' fra midlertidig download-"
"fil ''{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 ""
-"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}\""
@@ -13339,11 +13484,8 @@ 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 "Behandler udvidelsesstedets ikon cachefiler..."
@@ -13357,9 +13499,24 @@ 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}''"
@@ -13800,16 +13957,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}"
+msgid "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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
-"Advarsel: kunne ikke tilgå mappen \"{0}\" af sikkerhedsårsager. Undtagelsen "
-"var: {1}"
msgid "{0}... [please type its number]"
msgstr "{0}... [indtast venligst dens nummer]"
@@ -13818,12 +13971,55 @@ 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 "
+"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 ""
@@ -13857,8 +14053,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 "
@@ -14189,6 +14399,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 ""
@@ -14460,6 +14675,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."
@@ -14518,9 +14736,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 ""
@@ -14563,6 +14778,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"
@@ -14698,6 +14918,9 @@ msgstr "Vold"
msgid "Lit"
msgstr "Oplyst"
+msgid "Toll"
+msgstr "Betalingsanlæg"
+
msgid "Motorway Link"
msgstr "Motorvejsforbindelse"
@@ -14777,7 +15000,7 @@ msgid "Edit Unclassified Road"
msgstr "Rediger uklassificeret vej"
msgid "Passing Places"
-msgstr "Passerer steder"
+msgstr "Vigesteder"
msgid "Width (meters)"
msgstr "Bredde (meter)"
@@ -14788,6 +15011,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"
@@ -14806,11 +15073,11 @@ msgstr "Område"
msgid "Service"
msgstr "Service"
-msgid "Edit Serviceway"
-msgstr "Ret servicevej"
+msgid "Edit Service Way"
+msgstr ""
-msgid "Serviceway type"
-msgstr "Servicevej type"
+msgid "Service way type"
+msgstr ""
msgid "alley"
msgstr "gyde"
@@ -14821,6 +15088,9 @@ msgstr "indkørsel"
msgid "parking_aisle"
msgstr "Vej mellem parkeringsbåse"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Vej mellem parkeringsbåse"
@@ -14848,18 +15118,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"
@@ -14869,9 +15133,6 @@ msgstr ""
msgid "General Access"
msgstr "Generel adgang"
-msgid "destination"
-msgstr "destination"
-
msgid "delivery"
msgstr "levering"
@@ -14881,15 +15142,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"
@@ -14935,6 +15196,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)"
@@ -15019,6 +15283,9 @@ msgstr "Rediger bro"
msgid "viaduct"
msgstr "viadukt"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -15123,20 +15390,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"
@@ -15153,11 +15429,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"
@@ -15192,8 +15468,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"
@@ -15261,12 +15537,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"
@@ -15282,15 +15564,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 ""
@@ -15312,6 +15585,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"
@@ -15321,6 +15603,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Mini-rundkørsel"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Retning"
@@ -15330,11 +15615,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"
@@ -15364,10 +15646,7 @@ msgid "table"
msgstr ""
msgid "Passing Place"
-msgstr "Passerer sted"
-
-msgid "Edit Passing Place"
-msgstr "Rediger passagested"
+msgstr "Vigested"
msgid "Turning Circle"
msgstr "Vendeplads"
@@ -15411,6 +15690,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr "Tilladt trafik:"
+msgid "Material"
+msgstr "Materiale"
+
+msgid "stone"
+msgstr "sten"
+
msgid "Bollard"
msgstr "Pæl"
@@ -15426,6 +15711,9 @@ msgstr "opstigende"
msgid "removable"
msgstr "flytbar"
+msgid "plastic"
+msgstr "plastik"
+
msgid "Cycle Barrier"
msgstr "Cykelhindring"
@@ -15495,20 +15783,17 @@ msgstr ""
msgid "electric"
msgstr "elektrisk"
-msgid "roundpole"
-msgstr ""
+msgid "pole"
+msgstr "stang"
-msgid "split_rail"
+msgid "Guard Rail"
msgstr ""
-msgid "chain"
-msgstr "Trådhegn"
-
-msgid "hedge"
-msgstr "hæk"
+msgid "Edit Guard Rail"
+msgstr ""
-msgid "pole"
-msgstr "stang"
+msgid "wire"
+msgstr ""
msgid "Guard Rail"
msgstr ""
@@ -15538,8 +15823,9 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr "Grøft"
+msgctxt "Barrier"
msgid "Edit Ditch"
-msgstr "Redigér grøft"
+msgstr ""
msgid "Kerb"
msgstr "Kantsten"
@@ -15547,11 +15833,11 @@ msgstr "Kantsten"
msgid "Edit Kerb"
msgstr "Rediger kantsten"
-msgid "Entrance"
-msgstr "Indgang"
+msgid "Entrance (barrier opening)"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Ret indgang"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Låge/led"
@@ -15604,12 +15890,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr "Materiale"
-
-msgid "stone"
-msgstr "sten"
-
msgid "Turnstile"
msgstr "Tælleapparat"
@@ -15670,12 +15950,21 @@ msgstr "Ret dræn"
msgid "Ditch"
msgstr "Grøft"
+msgid "Edit Ditch"
+msgstr "Redigér grøft"
+
msgid "Stream"
msgstr "Bæk"
msgid "Edit Stream"
msgstr "Ret bæk"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Kanal"
@@ -15715,9 +16004,6 @@ msgstr "Ret dæmning"
msgid "Groyne"
msgstr "Høfde"
-msgid "Edit Groyne"
-msgstr "Redigér høfde"
-
msgid "Breakwater"
msgstr "Bølgebryder"
@@ -15751,11 +16037,26 @@ msgstr "Ret overdækket reservoir"
msgid "Edit Water"
msgstr "Ret vandområde"
-msgid "Land"
-msgstr "Land"
+msgid "Water Body"
+msgstr ""
-msgid "Edit Land"
-msgstr "Ret landområde"
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
+msgid "Land"
+msgstr "Land"
+
+msgid "Edit Land"
+msgstr "Ret landområde"
msgid "Coastline"
msgstr "Kystlinje"
@@ -15832,18 +16133,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 "passagerer;køretøj"
@@ -15860,10 +16166,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"
@@ -15919,8 +16225,8 @@ msgstr "turisme"
msgid "freight"
msgstr "fragt"
-msgid "Service/Type"
-msgstr "Service/type"
+msgid "Service type"
+msgstr ""
msgid "yard"
msgstr "Banegård"
@@ -15943,11 +16249,14 @@ msgstr ""
msgid "rail"
msgstr "bane"
-msgid "Voltage"
-msgstr "Spænding"
+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"
@@ -15958,9 +16267,6 @@ msgstr "Smalsporet bane"
msgid "Edit Narrow Gauge Rail"
msgstr "Ret smalsporet jernbane"
-msgid "Types"
-msgstr "Typer"
-
msgid "Monorail"
msgstr "Monorail"
@@ -16012,6 +16318,9 @@ msgstr "Rediger forladt jernbane"
msgid "Level Crossing"
msgstr "Jernbaneoverskæring"
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr "Overvåget"
@@ -16024,18 +16333,32 @@ 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 "halv"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "fuld"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "double_half"
msgstr ""
msgid "Crossing"
msgstr "Fodgængerovergang (over jernbane)"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Overgangstype"
@@ -16135,13 +16458,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"
@@ -16151,11 +16472,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Rediger station"
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -16174,12 +16493,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"
@@ -16207,9 +16526,6 @@ msgstr "Parkeringsbås"
msgid "Edit Parking space"
msgstr "Rediger parkeringsbås"
-msgid "rooftop"
-msgstr "taget"
-
msgid "Capacity"
msgstr "Kapacitet"
@@ -16231,11 +16547,30 @@ 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 "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 "Parkeringsindkørsel"
@@ -16384,6 +16719,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"
@@ -16405,6 +16743,12 @@ msgstr "Bilmekaniker"
msgid "Edit Car Repair"
msgstr "Ret bilmekaniker"
+msgid "Parts"
+msgstr "Dele"
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr "Dæk"
@@ -16432,6 +16776,12 @@ msgstr "Udlejning"
msgid "Edit Car Rental"
msgstr "Ret biludlejning"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr "kun"
+
msgid "Sharing"
msgstr "Deling"
@@ -16456,22 +16806,6 @@ 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"
@@ -16493,9 +16827,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Dele"
-
msgid "Clothes"
msgstr "Tøj"
@@ -16690,6 +17021,9 @@ msgstr "Platform"
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr "Bus"
@@ -16720,6 +17054,9 @@ msgstr "Kabelbane"
msgid "Ferry"
msgstr "Færge"
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Bænk"
@@ -16732,9 +17069,6 @@ msgstr "kørestol"
msgid "limited"
msgstr "begrænset"
-msgid "only"
-msgstr "kun"
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -16744,9 +17078,14 @@ msgstr "Jernbaneplatform (gammel)"
msgid "funicular"
msgstr "kabelbane"
+msgctxt "railway"
msgid "Station"
msgstr "Station"
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Rediger station"
+
msgid "Building"
msgstr "Bygning"
@@ -16759,6 +17098,9 @@ msgstr "Ret nedgang til undergrundsbane"
msgid "Ticket Machine"
msgstr "Billetautomat"
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr "Referencenummer"
@@ -16783,14 +17125,6 @@ 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"
@@ -16839,8 +17173,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"
@@ -16893,6 +17227,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"
@@ -16915,21 +17264,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"
@@ -17119,9 +17453,6 @@ msgstr "Stripklub"
msgid "Edit Stripclub"
msgstr "Rediger stripklub"
-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 "Tourism"
msgstr "Turisme"
@@ -17143,9 +17474,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 ""
@@ -17158,6 +17495,9 @@ msgstr "gade"
msgid "scheme"
msgstr "skema"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Vist område"
@@ -17197,6 +17537,9 @@ msgstr "... andre transporttyper er mulige"
msgid "Information Board"
msgstr "Informationstavle"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -17218,23 +17561,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"
@@ -17363,50 +17718,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"
@@ -17423,6 +17772,12 @@ msgstr "katolsk"
msgid "evangelical"
msgstr "evangelisk"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "Jehovas Vidner"
@@ -17435,6 +17790,9 @@ msgstr "metodistisk"
msgid "mormon"
msgstr "mormonsk"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ortodoks"
@@ -17453,50 +17811,150 @@ msgstr "kvæker"
msgid "roman_catholic"
msgstr "Romersk katolsk"
-msgid "shia"
-msgstr "shiitisk"
+msgid "russian_orthodox"
+msgstr ""
-msgid "sunni"
-msgstr "sunnitisk"
+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 "sunni"
+msgstr "sunnitisk"
+
+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 "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"
@@ -17573,6 +18031,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"
@@ -17654,12 +18118,66 @@ msgstr "Dyrlæge"
msgid "Edit Veterinary"
msgstr "Ret dyrlæge"
-msgid "Drinking water"
-msgstr "Drikkevand"
+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"
@@ -17669,6 +18187,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"
@@ -17678,30 +18220,36 @@ msgstr "Rediger ur"
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 ""
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"
@@ -17730,8 +18278,8 @@ msgstr "Viser fugtighed"
msgid "Recycling"
msgstr "Genbrug"
-msgid "Edit Recycling station"
-msgstr "Ret genbrugsplads"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Batterier"
@@ -17757,21 +18305,15 @@ msgstr "center"
msgid "Waste Basket"
msgstr "Skraldespand"
-msgid "Edit Waste Basket"
-msgstr "Rediger skraldespand"
-
msgid "Waste Disposal"
msgstr "Affaldsbortskaffelse"
-msgid "Edit Waste Disposal"
-msgstr "Rediger affaldsbortskaffelse"
+msgid "Edit Bench"
+msgstr ""
msgid "Backrest"
msgstr "Ryglæn"
-msgid "plastic"
-msgstr "plastik"
-
msgid "Amount of Seats"
msgstr "Antal sæder"
@@ -17806,8 +18348,17 @@ msgstr "Ret jagttårn"
msgid "Height"
msgstr "Højde"
+msgctxt "height"
msgid "low"
-msgstr "lav"
+msgstr ""
+
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
msgid "Hide"
msgstr "Skjul"
@@ -17815,9 +18366,6 @@ msgstr "Skjul"
msgid "Lock"
msgstr "Lås"
-msgid "Drinking Water"
-msgstr "Vandpost"
-
msgid "Edit Source of Potable Water"
msgstr "Rediger kilde til drikkevand"
@@ -17849,6 +18397,9 @@ msgstr "dam"
msgid "Diameter (in mm)"
msgstr "Diameter (i mm)"
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr "bane"
@@ -17886,119 +18437,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 "amerikansk fodbold"
+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 "canadisk fodbold"
+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 "cricketnet"
+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"
@@ -18030,26 +18617,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 ""
@@ -18057,6 +18645,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "bane"
+
+msgid "sports_centre"
+msgstr "sportshal"
+
+msgid "stadium"
+msgstr "stadion"
+
msgid "10pin"
msgstr "Bowling"
@@ -18090,6 +18687,22 @@ msgstr "Ret kanosport"
msgid "Edit Cycling"
msgstr "Ret 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 "Hundeløb"
@@ -18146,7 +18759,7 @@ msgid "Skating"
msgstr "Skøjteløb"
msgid "Edit Skating"
-msgstr "Rediger skøjteløb"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -18190,36 +18803,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 ""
@@ -18262,19 +18893,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 ""
@@ -18413,6 +19040,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"
@@ -18425,38 +19064,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 ""
@@ -18464,21 +19138,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 "rækkehus"
+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"
@@ -18703,66 +19416,182 @@ 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 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 "Noise"
+msgstr ""
+
+msgid "GPS Signals"
+msgstr ""
+
+msgid "GLONASS Signals"
+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 "Målepunkt"
+
+msgid "Edit Survey Point"
+msgstr "Ret målepunkt"
+
+msgid "Surveillance Camera"
+msgstr ""
+
+msgid "Edit Surveillance Camera"
+msgstr "Ret overvågningskamera"
+
+msgid "indoor"
+msgstr "indendørs"
+
+msgid "outdoor"
+msgstr "udendørs"
+
+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 "Edit Measurement Station"
-msgstr "Ret målestation"
+msgid "Inclination in degrees"
+msgstr ""
-msgid "Measurement"
-msgstr "Måling"
+msgid "Height in meter (m)"
+msgstr ""
-msgid "particulate_matter"
+msgid "Power"
+msgstr "Strøm"
+
+msgid "Power Plant"
msgstr ""
-msgid "seismic"
+msgid "Edit Power Plant"
msgstr ""
-msgid "water_level"
+msgid "Start date"
msgstr ""
-msgid "weather"
-msgstr "vejer"
+msgid "Output forms of energy"
+msgstr ""
-msgid "Recording"
-msgstr "Optager"
+msgid "(please add this information to the generators if possible)"
+msgstr ""
-msgid "manually"
-msgstr "manuelt"
+msgid "electricity"
+msgstr "elekticitet"
-msgid "automated"
-msgstr "automatiseret"
+msgid "2 W"
+msgstr "2 W"
-msgid "remote"
-msgstr "remote"
+msgid "3 kW"
+msgstr "3 kW"
-msgctxt "display"
-msgid "no"
-msgstr "nej"
+msgid "5 MW"
+msgstr "5 MW"
-msgid "Survey Point"
-msgstr "Målepunkt"
+msgid "7 GW"
+msgstr "7 GW"
-msgid "Edit Survey Point"
-msgstr "Ret målepunkt"
+msgid "hot water"
+msgstr "varmt vand"
-msgid "Surveillance"
-msgstr "Overvågning"
+msgid "hot air"
+msgstr "varm luft"
-msgid "Edit Surveillance Camera"
-msgstr "Ret overvågningskamera"
+msgid "cold water"
+msgstr "koldt vand"
-msgid "indoor"
-msgstr "indendørs"
+msgid "cold air"
+msgstr "kold luft"
-msgid "outdoor"
-msgstr "udendørs"
+msgid "compressed air"
+msgstr "komprimeret luft"
-msgid "public"
-msgstr "offentlig"
+msgid "steam"
+msgstr "damp"
-msgid "Power"
-msgstr "Strøm"
+msgid "vacuum"
+msgstr "vakuum"
msgid "Power Generator"
msgstr "Generator"
@@ -18815,89 +19644,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 "battery charging"
-msgstr "batteri opladning"
+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 "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"
@@ -18908,6 +19840,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"
@@ -18923,6 +19870,9 @@ msgstr "Ret elmast"
msgid "Tower reference"
msgstr "Tårn reference"
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr "Pæl"
@@ -18941,11 +19891,9 @@ msgstr "Ret strømkabel"
msgid "Line type"
msgstr "Linie type"
-msgctxt "Power Line"
msgid "line"
msgstr "line"
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -19054,11 +20002,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"
@@ -19069,7 +20017,7 @@ msgstr "Ret slagter"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -19090,6 +20038,9 @@ msgstr "Markedsplads"
msgid "Edit Marketplace"
msgstr "Rediger markedsplads"
+msgid "Organic"
+msgstr "Økologisk"
+
msgid "Greengrocer"
msgstr "Grønthandler"
@@ -19102,9 +20053,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr "Økologisk"
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -19174,8 +20122,8 @@ msgstr "Rediger skrædder"
msgid "Fabric"
msgstr "Stof"
-msgid "Edit Fabric"
-msgstr "Rediger stof"
+msgid "Edit Fabric Shop"
+msgstr ""
msgid "Electronic"
msgstr "Elektronisk"
@@ -19195,14 +20143,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"
@@ -19210,7 +20158,6 @@ msgstr "Hi-fi"
msgid "Edit Hifi Shop"
msgstr "Ret hi-fi-forhandler"
-msgctxt "shop"
msgid "Video"
msgstr "Video"
@@ -19238,6 +20185,12 @@ msgstr "Ret vekselkontor"
msgid "Edit Automated Teller Machine"
msgstr "Ret pengeautomat"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -19274,11 +20227,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"
@@ -19307,8 +20281,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"
@@ -19319,20 +20293,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"
@@ -19367,8 +20341,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"
@@ -19580,6 +20554,12 @@ msgstr "Tinde"
msgid "Edit Peak"
msgstr "Ret tinde"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Gletsjer"
@@ -19619,24 +20599,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 "nåleskov"
+msgstr "Nåleskov"
-msgctxt "wood"
msgid "deciduous"
-msgstr "løvskov"
+msgstr "Løvskov"
-msgctxt "wood"
msgid "mixed"
msgstr "blandet"
@@ -19646,15 +20635,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 ""
@@ -19730,6 +20710,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"
@@ -19784,8 +20770,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 ""
@@ -19796,6 +20782,9 @@ msgstr "Gravplads"
msgid "Edit Graveyard"
msgstr "Ret gravplads"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Kirkegård"
@@ -19871,6 +20860,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"
@@ -19901,11 +20917,23 @@ msgstr "Nummereringssystem"
msgid "odd"
msgstr "ulige"
-msgid "even"
-msgstr "lige"
+msgid "even"
+msgstr "lige"
+
+msgid "alphabetic"
+msgstr "alfabetisk"
+
+msgid "Accuracy"
+msgstr "Præcision"
+
+msgid "actual"
+msgstr ""
-msgid "alphabetic"
-msgstr "alfabetisk"
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
msgid "Contact (common schema)"
msgstr "Kontakt (normalt skema)"
@@ -20075,20 +21103,49 @@ msgstr "Generel rute"
msgid "Edit general route"
msgstr "Rediger generel rute"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+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"
@@ -20135,20 +21192,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"
@@ -20171,8 +21231,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)"
@@ -20267,18 +21327,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 ""
+msgid "bicycle"
+msgstr "cykel"
+
+msgid "foot"
+msgstr "fod"
+
msgid "horse"
msgstr "hest"
@@ -20288,7 +21357,10 @@ msgstr "barriere"
msgid "motorroad"
msgstr "hovedvej"
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -20297,10 +21369,10 @@ msgstr "services"
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -20318,6 +21390,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -20333,35 +21408,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"
@@ -20375,20 +21450,20 @@ msgstr "marina"
msgid "amenity"
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"
@@ -20462,11 +21537,14 @@ msgstr "rute"
msgid "boundary"
msgstr "grænse"
+msgid "sport"
+msgstr "sport"
+
msgid "place"
msgstr "sted"
-msgid "tiger_data"
-msgstr "tiger_data"
+msgid "tiger.data"
+msgstr ""
msgid "address"
msgstr "adresse"
@@ -20480,9 +21558,6 @@ msgstr "By"
msgid "One Way"
msgstr "Ensrettet"
-msgid "Church"
-msgstr "Kirke"
-
msgid "Fuel Station"
msgstr "Benzintank"
@@ -20510,6 +21585,9 @@ 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 "Unavngivet uklassificeret highway"
@@ -20555,11 +21633,41 @@ 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 "incline without highway"
-msgstr "incline uden 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"
msgstr "junction uden highway"
@@ -20570,8 +21678,8 @@ msgstr "lanes uden highway"
msgid "lcn without highway"
msgstr "lcn uden highway"
-msgid "lit without highway"
-msgstr "lit uden highway"
+msgid "lit without highway/railway/piste/parking/platform"
+msgstr ""
msgid "living_street without highway"
msgstr "living_street uden highway"
@@ -20588,8 +21696,8 @@ msgstr "motorroad uden highway"
msgid "ntd_id without highway"
msgstr "ntd_id uden highway"
-msgid "oneway without highway"
-msgstr "oneway uden highway"
+msgid "oneway without highway or railway"
+msgstr ""
msgid "sac_scale without highway"
msgstr "sac_scale uden highway"
@@ -20705,20 +21813,131 @@ msgstr "canal uden waterway"
msgid "have_riverbank without waterway"
msgstr "have_riverbank uden waterway"
-msgid "tunnel without highway/railway/waterway"
-msgstr "tunnel uden highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
-msgid "bridge without highway/railway/waterway"
-msgstr "bridge uden highway/railway/waterway"
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
-msgid "psv without highway/railway/waterway"
-msgstr "psv uden highway/railway/waterway"
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
msgid "width without physical linear feature"
msgstr "width uden fysiske lineære træk"
-msgid "maxspeed without highway/railway/traffic_sign"
-msgstr "maxspeed uden 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"
msgstr "religion uden trosretning"
@@ -20737,8 +21956,47 @@ msgid ""
msgstr ""
"intet wikipedia-sprog angivet, brug \"wikipedia\"=\"sprog:sidetitel\""
-msgid "unkown language prefix in wikipedia tag"
-msgstr "ukendt sprog præfiks i wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
+msgstr ""
+
+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 "Landsat"
msgstr "Landsat"
@@ -20749,20 +22007,29 @@ msgstr "Yahoo Sat"
msgid "Bing Sat"
msgstr "Bing Sat"
+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 "skobbler heatmap"
msgstr "skobbler heatmap"
@@ -20782,8 +22049,8 @@ msgstr "OpenStreetMap (Tysk stilart)"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Cambodia, Laos, Thailand, Vietnam tosproget"
-msgid "2u"
-msgstr "2u"
+msgid "osmfr"
+msgstr ""
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI sort-og-hvid 2.5m"
@@ -20791,6 +22058,9 @@ 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)"
@@ -20939,6 +22209,29 @@ 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 ""
+
+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 "Imagerie Drone (Haiti)"
@@ -21041,41 +22334,41 @@ msgstr "ITACyL - Castile and León"
msgid "IDEIB - Balearic Islands"
msgstr "IDEIB - Balearic Islands"
-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 "Stadtplan Zürich"
+msgid "VoGIS: DGM (Terrain model)"
+msgstr "VoGIS: DGM (Terrain model)"
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
-msgstr "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "VoGIS: DOM (Surface model)"
+msgstr "VoGIS: DOM (Surface model)"
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
-msgstr "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Geobase Hydrography"
+msgstr "Geobase Hydrography"
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
-msgstr "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Geobase Roads"
+msgstr "Geobase Roads"
-msgid "Canton de Génève 5cm (SITG 2011)"
-msgstr "Canton de Génève 5cm (SITG 2011)"
+msgid "Canvec"
+msgstr "Canvec"
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
-msgstr "Canton de 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 (Danmark)"
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Stevns (Denmark)"
+msgstr "Stevns (Danmark)"
msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
@@ -21089,21 +22382,26 @@ msgstr "SIGIP - Orthophoto 2012"
msgid "Lausanne - Orthophoto technique 2012"
msgstr "Lausanne - Orthophoto technique 2012"
-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 Roads Overlay"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
+
msgid "OSM - Tiger Edited Map"
msgstr "OSM - Tiger Edited Map"
@@ -21116,29 +22414,29 @@ msgstr "NC 2010 Orthoimagery"
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Ukraine - Orthophotomaps 2012"
-msgid "7th Series (OS7)"
-msgstr "7th Series (OS7)"
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr "OpenStreetMap (Sorbian Language)"
-msgid "OS New Popular Edition historic"
-msgstr "OS New Popular Edition historic"
+msgid "OpenStreetMap (German Language)"
+msgstr "OpenStreetMap (German Language)"
-msgid "OS OpenData StreetView"
-msgstr "OS OpenData StreetView"
+msgid "OpenPT Map (overlay)"
+msgstr "OpenPT Map (overlay)"
-msgid "OS OpenData Locator"
-msgstr "OS OpenData Locator"
+msgid "Hamburg (40 cm)"
+msgstr "Hamburg (40 cm)"
-msgid "Surrey Air Survey"
-msgstr "Surrey Air Survey"
+msgid "Hamburg (DK5)"
+msgstr "Hamburg (DK5)"
-msgid "NLS - OS 6-inch Scotland 1842-82"
-msgstr "NLS - OS 6-inch Scotland 1842-82"
+msgid "Bavaria (2 m)"
+msgstr "Bavaria (2 m)"
-msgid "NLS - OS 1:25k 1st Series 1937-61"
-msgstr "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Stuttgart (Luftbild)"
+msgstr "Stuttgart (Luftbild)"
-msgid "NLS - OS 1-inch 7th Series 1955-61"
-msgstr "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Imagerie Drone (Haiti)"
+msgstr "Imagerie Drone (Haiti)"
msgid "OS 1:25k historic (OSM)"
msgstr "OS 1:25k historic (OSM)"
@@ -21149,6 +22447,39 @@ msgstr "OS Scottish Popular historic"
msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr "NLS - Bartholomew Half Inch, 1897-1907"
+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 "Export"
+msgstr "Eksporter"
+
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "opdatér port liste"
+
+msgid "Configure"
+msgstr "Konfigurer"
+
+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 "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV Filer"
@@ -21356,6 +22687,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 ""
@@ -21377,14 +22720,8 @@ msgstr ""
msgid "Time"
msgstr "Tid"
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr "Automatisk"
-
-msgid "Fixed value"
-msgstr ""
+msgid "Tracks"
+msgstr "Spor"
msgid "Elevation profile for track ''{0}''."
msgstr ""
@@ -21646,10 +22983,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -21853,8 +23193,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"
@@ -22125,15 +23465,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"
@@ -22306,6 +23637,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 ""
@@ -22324,12 +23658,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "høj"
-
-msgid "medium"
-msgstr "medium"
-
msgid "symbol"
msgstr "symbol"
@@ -22467,6 +23795,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 ""
@@ -22485,6 +23816,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 "Tilføj \"source=...\" til elementer?"
@@ -22636,8 +23970,8 @@ msgstr ""
msgid "Save image as..."
msgstr ""
-msgid "PNG files (*.png)"
-msgstr "PNG filer (*.png)"
+msgid "Click second corner for image cropping"
+msgstr "Klik andet hjørne til billedbeskæring"
msgid "GeoTiff files (*.tif)"
msgstr ""
@@ -22717,8 +24051,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"
@@ -22767,8 +24104,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"
@@ -22994,27 +24331,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"
@@ -24100,9 +25419,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>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"
@@ -24492,6 +25835,9 @@ msgstr ""
msgid "Reading 7Zip file..."
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -24757,9 +26103,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 "Process queue"
msgstr "Behandlingskø"
@@ -24816,18 +26159,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"
@@ -25176,6 +26507,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -25327,6 +26679,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 ""
@@ -25649,9 +27005,6 @@ 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:"
@@ -25869,6 +27222,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 ""
@@ -25904,15 +27260,35 @@ 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 "skilte"
+msgid "Change Properties"
+msgstr "Ret egenskaber"
+
msgid "Country preset:"
msgstr ""
@@ -26027,9 +27403,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)"
@@ -26208,20 +27581,20 @@ 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"
-msgstr "usynlig"
+msgid "Seamark Inspector"
+msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
-msgstr "Eksporter"
+msgid "Select a map object"
+msgstr ""
msgid "AutoSave LiveData"
msgstr ""
@@ -26442,6 +27815,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 ""
@@ -26478,6 +27940,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..."
@@ -26633,9 +28099,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr "Præcision"
-
msgid "Select as much as you like:"
msgstr "Vælg så mange som du har lyst til:"
@@ -27627,9 +29090,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"
@@ -27919,9 +29379,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 c3b50c6..b8f9aaf 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-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-08-09 20:09+0000\n"
-"Last-Translator: Carsten Gerlach <daswaldhorn at gmx.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-08-10 04:33+0000\n"
-"X-Generator: Launchpad (build 16723)\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,9 @@ 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}"
@@ -60,6 +66,9 @@ msgstr "INFO: {0}"
msgid "DEBUG: {0}"
msgstr "DEBUG: {0}"
+msgid "Cause: "
+msgstr "Ursache: "
+
msgid "Executing platform startup hook"
msgstr "Plattform-Start ausführen"
@@ -164,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 "
@@ -268,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"
@@ -307,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"
@@ -363,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"
@@ -554,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)"
@@ -683,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"
@@ -855,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."
@@ -1068,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 "
@@ -1097,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>"
@@ -1280,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"
@@ -1436,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"
@@ -1553,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"
@@ -1856,6 +1879,9 @@ 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})"
@@ -2108,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"
@@ -2592,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"
@@ -2703,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"
@@ -2804,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 "
@@ -2904,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"
@@ -2940,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"
@@ -2968,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"
@@ -3090,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"
@@ -3156,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"
@@ -3189,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"
@@ -3219,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}"
@@ -3252,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 "
@@ -3280,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 "
@@ -3293,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 "
@@ -3322,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}"
@@ -3357,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"
@@ -3546,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."
@@ -3664,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)"
@@ -3710,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"
@@ -3755,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"
@@ -3779,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"
@@ -3840,6 +3877,9 @@ 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"
@@ -3880,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 "
@@ -3902,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."
@@ -3926,6 +3966,15 @@ 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"
@@ -4000,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"
@@ -4061,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})"
@@ -4102,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}"
@@ -4247,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"
@@ -4322,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}"
@@ -4352,9 +4410,6 @@ msgstr "Gebäude"
msgid "area"
msgstr "Fläche"
-msgid "Unclosed way"
-msgstr "Nicht geschlossene Linie"
-
msgid "Unconnected ways"
msgstr "Unverbundene Linien"
@@ -4383,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\""
@@ -4451,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)"
@@ -4576,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"
@@ -4737,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"
@@ -4826,6 +4860,18 @@ msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
"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"
@@ -4932,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)"
@@ -5059,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"
@@ -5262,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."
@@ -5269,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."
@@ -5276,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."
@@ -5294,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"
@@ -5310,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"
@@ -5365,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"
@@ -5651,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 "
@@ -5852,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>"
@@ -6146,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 "
@@ -6255,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"
@@ -6339,6 +6381,38 @@ msgstr "Stil ist gerade aktiv?"
msgid "No"
msgstr "Nein"
+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 ""
+"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"
@@ -6433,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 "
@@ -6614,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"
@@ -6949,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 ""
@@ -7024,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 "Properties/Memberships"
-msgstr "Eigenschaften/Mitgliedschaften"
+msgid "Discardable key: selection Background"
+msgstr "Überflüssiger Schlüssel: Auswahl-Hintergrund"
-msgid "Properties for selected objects."
-msgstr "Eigenschaften der ausgewählten Objekte."
+msgid "Discardable key: foreground"
+msgstr "Überflüssiger Schlüssel: Vordergrund"
+
+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"
@@ -7066,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)"
@@ -7236,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"
@@ -7602,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"
@@ -7671,7 +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."
+msgstr "Als Längengrad wird ein Wert im Intervall [-180,180] erwartet."
msgid "Data Sources and Types:"
msgstr "Datenquellen und -typen:"
@@ -7750,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, "
@@ -7778,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"
@@ -7863,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>"
@@ -7883,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"
@@ -7914,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."
@@ -8024,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"
@@ -8136,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"
@@ -8162,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:"
@@ -8234,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"
@@ -8321,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 "
@@ -8334,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"
@@ -8381,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"
@@ -8598,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 "
@@ -8618,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"
@@ -8634,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"
@@ -8641,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 ..."
@@ -8700,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"
@@ -8720,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}''"
@@ -8789,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..."
@@ -8803,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>"
@@ -8823,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:"
@@ -8845,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"
@@ -8875,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 ""
@@ -8977,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"
@@ -9010,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"
@@ -9184,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}"
@@ -9390,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..."
@@ -9411,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"
@@ -9470,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"
@@ -9553,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"
@@ -9758,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}''..."
@@ -9786,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"
@@ -9797,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:"
@@ -9814,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>"
@@ -10070,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"
@@ -10631,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"
@@ -10885,6 +10994,44 @@ 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"
+
+msgid "Value: "
+msgstr "Wert: "
+
+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: NonDefalut"
msgstr "Erweiterter Hintergrund: keine Standardeinstellung"
@@ -10955,6 +11102,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"
@@ -11019,6 +11169,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"
@@ -11517,6 +11674,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"
@@ -11587,8 +11750,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"
@@ -11873,21 +12036,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"
@@ -11909,6 +12057,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}''"
@@ -11975,10 +12138,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:"
@@ -11987,29 +12150,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. "
@@ -12102,18 +12266,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"
@@ -12185,8 +12343,8 @@ msgstr "Vorlage anwenden"
msgid "New relation"
msgstr "Neue Relation"
-msgid "Change Properties"
-msgstr "Einstellungen ändern"
+msgid "Change Tags"
+msgstr "Schlagwörter ändern"
msgid "Unknown requisite: {0}"
msgstr "Unbekannte Vorraussetzung: {0}"
@@ -12274,9 +12432,6 @@ 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}: "
@@ -12295,6 +12450,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 (*.*)"
@@ -12330,9 +12495,61 @@ msgstr ""
"Der aktuelle Wert ist keine gültige OSM-ID. Bitte einen Ganzzahlwert > 1 "
"eingeben"
+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 "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 ""
@@ -12369,10 +12586,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."
@@ -12422,40 +12639,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..."
@@ -12560,6 +12775,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}."
@@ -12575,16 +12793,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."
@@ -12671,8 +12897,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!"
@@ -12785,49 +13011,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 "
@@ -12837,11 +13029,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..."
@@ -12870,11 +13062,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 ""
@@ -12970,12 +13159,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}"
@@ -13182,10 +13371,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 "RemoteControl::Accepting connections on port {0}"
msgstr ""
@@ -13234,6 +13429,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."
@@ -13270,20 +13474,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: "
@@ -13308,6 +13512,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"
@@ -13315,6 +13528,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."
@@ -13393,18 +13609,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"
@@ -13576,11 +13792,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"
@@ -13594,30 +13810,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"
@@ -13695,11 +13909,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..."
@@ -13713,12 +13926,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}''"
@@ -14180,15 +14408,13 @@ 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 "{0}... [please type its number]"
@@ -14201,9 +14427,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."
@@ -14239,8 +14512,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 "
@@ -14590,6 +14877,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 ""
@@ -14900,6 +15194,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."
@@ -14963,9 +15260,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"
@@ -15013,6 +15307,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"
@@ -15156,6 +15457,9 @@ msgstr "Straßendamm"
msgid "Lit"
msgstr "Beleuchtet"
+msgid "Toll"
+msgstr "Maut"
+
msgid "Motorway Link"
msgstr "Autobahnanschluss"
@@ -15246,6 +15550,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"
@@ -15264,10 +15612,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"
@@ -15279,6 +15627,9 @@ msgstr "Auffahrt"
msgid "parking_aisle"
msgstr "Parkplatzweg"
+msgid "drive-through"
+msgstr "Durchfahrtsbedienung"
+
msgid "Parking Aisle"
msgstr "Parkplatzweg"
@@ -15306,18 +15657,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)"
@@ -15327,9 +15672,6 @@ msgstr "Transportarteinschränkung"
msgid "General Access"
msgstr "Genereller Zugang"
-msgid "destination"
-msgstr "Anlieger frei"
-
msgid "delivery"
msgstr "Lieferverkehr frei"
@@ -15339,15 +15681,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"
@@ -15393,6 +15735,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)"
@@ -15477,6 +15822,9 @@ msgstr "Brücke bearbeiten"
msgid "viaduct"
msgstr "Viadukt"
+msgid "suspension"
+msgstr "Hängebrücke"
+
msgid "swing"
msgstr "Drehbrücke"
@@ -15595,21 +15943,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"
@@ -15625,11 +15982,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"
@@ -15664,8 +16021,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"
@@ -15733,12 +16090,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"
@@ -15754,15 +16117,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)"
@@ -15784,6 +16138,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"
@@ -15793,6 +16156,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"
@@ -15802,11 +16168,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"
@@ -15838,9 +16201,6 @@ msgstr "Bodenwelle (sehr lang und flach)"
msgid "Passing Place"
msgstr "Ausweichstelle"
-msgid "Edit Passing Place"
-msgstr "Ausweichstelle bearbeiten"
-
msgid "Turning Circle"
msgstr "Wendestelle"
@@ -15883,6 +16243,12 @@ msgstr "Steinblock"
msgid "Allowed traffic:"
msgstr "Erlaubter Verkehr:"
+msgid "Material"
+msgstr "Material"
+
+msgid "stone"
+msgstr "Stein"
+
msgid "Bollard"
msgstr "Poller"
@@ -15898,6 +16264,9 @@ msgstr "ausfahrend"
msgid "removable"
msgstr "entfernbar"
+msgid "plastic"
+msgstr "Kunststoff"
+
msgid "Cycle Barrier"
msgstr "Umlaufgitter"
@@ -15967,20 +16336,17 @@ msgstr "Maschendraht"
msgid "electric"
msgstr "Elektrisch"
-msgid "roundpole"
-msgstr "Baumstämmchen"
-
-msgid "split_rail"
-msgstr "Holzbalken"
+msgid "pole"
+msgstr "Mast"
-msgid "chain"
-msgstr "Kette"
+msgid "Guard Rail"
+msgstr "Leitplanke"
-msgid "hedge"
-msgstr "Hecke"
+msgid "Edit Guard Rail"
+msgstr "Leitplanke bearbeiten"
-msgid "pole"
-msgstr "Mast"
+msgid "wire"
+msgstr "Drahtzaun"
msgid "Guard Rail"
msgstr "Leitplanke"
@@ -16010,6 +16376,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr "Wassergraben"
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr "Wassergraben bearbeiten"
@@ -16019,11 +16386,11 @@ msgstr "Bordstein"
msgid "Edit Kerb"
msgstr "Bordstein bearbeiten"
-msgid "Entrance"
-msgstr "Eingang"
+msgid "Entrance (barrier opening)"
+msgstr "Barriere-Eingang/Öffnung"
-msgid "Edit Entrance"
-msgstr "Eingang bearbeiten"
+msgid "Edit Entrance (barrier opening)"
+msgstr "Barriere-Eingang/Öffnung bearbeiten"
msgid "Gate"
msgstr "Gatter / Tor"
@@ -16076,12 +16443,6 @@ msgstr "Schmale Lücke"
msgid "stepover"
msgstr "Übertritt"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "Stein"
-
msgid "Turnstile"
msgstr "Drehsperre"
@@ -16142,12 +16503,21 @@ msgstr "Abwassergraben bearbeiten"
msgid "Ditch"
msgstr "Wassergraben"
+msgid "Edit Ditch"
+msgstr "Wassergraben bearbeiten"
+
msgid "Stream"
msgstr "Bach"
msgid "Edit Stream"
msgstr "Bach bearbeiten"
+msgid "Wadi"
+msgstr "Wadi"
+
+msgid "Edit Wadi"
+msgstr "Wadi bearbeiten"
+
msgid "Canal"
msgstr "Kanal"
@@ -16187,9 +16557,6 @@ msgstr "Damm bearbeiten"
msgid "Groyne"
msgstr "Buhne"
-msgid "Edit Groyne"
-msgstr "Bearbeite Buhne"
-
msgid "Breakwater"
msgstr "Wellenbrecher"
@@ -16223,6 +16590,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"
@@ -16304,20 +16686,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"
@@ -16391,8 +16778,8 @@ msgstr "Tourismus"
msgid "freight"
msgstr "Güterzüge"
-msgid "Service/Type"
-msgstr "Dienst/Typ"
+msgid "Service type"
+msgstr "Service-Typ"
msgid "yard"
msgstr "Rangiergleis"
@@ -16415,11 +16802,14 @@ msgstr "Oberleitung"
msgid "rail"
msgstr "Eisenbahn"
-msgid "Voltage"
-msgstr "Spannung"
+msgid "Voltage in Volts (V)"
+msgstr "Spannung in Volt (V)"
+
+msgid "Frequency in Hertz (Hz)"
+msgstr "Frequenz in Hertz (Hz)"
-msgid "Frequency (Hz)"
-msgstr "Frequenz (Hz)"
+msgid "16.67"
+msgstr "16.67"
msgid "16.7"
msgstr "16,7"
@@ -16430,9 +16820,6 @@ msgstr "Schmalspurbahn"
msgid "Edit Narrow Gauge Rail"
msgstr "Schmalspurbahn bearbeiten"
-msgid "Types"
-msgstr "Arten"
-
msgid "Monorail"
msgstr "Einschienenbahn"
@@ -16484,6 +16871,9 @@ msgstr "Stillgelegte Gleise bearbeiten"
msgid "Level Crossing"
msgstr "Bahnübergang"
+msgid "Edit Level Crossing"
+msgstr "Bahnübergang bearbeiten"
+
msgid "Supervised"
msgstr "Bewacht"
@@ -16496,18 +16886,32 @@ 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"
@@ -16607,11 +17011,9 @@ msgstr "Laufband"
msgid "Edit Magic Carpet"
msgstr "Laufband bearbeiten"
-msgctxt "aerialway"
msgid "Goods"
msgstr "Materialseilbahn"
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr "Materialseilbahn bearbeiten"
@@ -16623,11 +17025,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Station bearbeiten"
-msgctxt "aerialway"
msgid "Pylon"
msgstr "Pfeiler"
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr "Pfeiler bearbeiten"
@@ -16646,12 +17046,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"
@@ -16679,9 +17079,6 @@ msgstr "Stellplatz"
msgid "Edit Parking space"
msgstr "Stellplatz anpassen"
-msgid "rooftop"
-msgstr "Hausdach"
-
msgid "Capacity"
msgstr "Kapazität"
@@ -16703,11 +17100,31 @@ 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 "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 "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 "Parkplatz-Einfahrt"
@@ -16856,6 +17273,9 @@ msgstr "Elektrotankstelle"
msgid "Edit Charging Station (for electric cars)"
msgstr "Bearbeite Elektrotankstelle"
+msgid "Voltage"
+msgstr "Spannung"
+
msgid "Amperage"
msgstr "Stromstärke"
@@ -16877,6 +17297,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"
@@ -16904,6 +17330,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"
@@ -16928,22 +17360,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"
@@ -16965,9 +17381,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Ersatzteile"
-
msgid "Clothes"
msgstr "Kleidung"
@@ -17163,6 +17576,9 @@ msgstr "Plattform"
msgid "Station or amenities"
msgstr "Station oder Amenities"
+msgid "Edit Stop Position"
+msgstr "Halteposition bearbeiten"
+
msgid "Bus"
msgstr "Bus"
@@ -17193,6 +17609,9 @@ msgstr "Standseilbahn"
msgid "Ferry"
msgstr "Fähre"
+msgid "Edit Platform"
+msgstr "Plattform bearbeiten"
+
msgid "Bench"
msgstr "Sitzbank"
@@ -17205,9 +17624,6 @@ msgstr "Rollstuhl"
msgid "limited"
msgstr "limitiert"
-msgid "only"
-msgstr "nur"
-
msgid "Highway platform (legacy)"
msgstr "Bussteig (legacy/veraltet)"
@@ -17217,9 +17633,14 @@ 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"
@@ -17232,6 +17653,9 @@ msgstr "U-Bahn-Eingang bearbeiten"
msgid "Ticket Machine"
msgstr "Fahrausweisautomat"
+msgid "Edit Ticket Machine"
+msgstr "Fahrkartenautomat bearbeiten"
+
msgid "Reference Number"
msgstr "Referenznummer"
@@ -17256,14 +17680,6 @@ 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"
@@ -17312,8 +17728,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"
@@ -17366,8 +17782,23 @@ msgstr "Terminal"
msgid "Edit Terminal"
msgstr "Terminal bearbeiten"
-msgctxt "airport"
-msgid "Gate"
+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"
msgid "Edit Terminal Gate"
@@ -17388,21 +17819,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"
@@ -17592,9 +18008,6 @@ msgstr "Strip-Klub"
msgid "Edit Stripclub"
msgstr "Strip-Klub ändern"
-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 "Tourism"
msgstr "Tourismus"
@@ -17616,9 +18029,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"
@@ -17631,6 +18050,9 @@ msgstr "Straße"
msgid "scheme"
msgstr "schematisch"
+msgid "toposcope"
+msgstr "Toposkop"
+
msgid "Shown Area"
msgstr "Gezeigtes Gebiet"
@@ -17670,6 +18092,9 @@ msgstr "...andere mögliche Transportarten"
msgid "Information Board"
msgstr "Informationstafel"
+msgid "Edit Information Board"
+msgstr "Informationstafel bearbeiten"
+
msgid "Board Content"
msgstr "Inhalt"
@@ -17691,23 +18116,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"
@@ -17836,50 +18273,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"
@@ -17896,6 +18327,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"
@@ -17908,6 +18345,9 @@ msgstr "methodistisch"
msgid "mormon"
msgstr "mormonisch"
+msgid "new_apostolic"
+msgstr "neuapostolisch"
+
msgid "orthodox"
msgstr "orthodox"
@@ -17926,38 +18366,139 @@ 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"
@@ -18046,6 +18587,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"
@@ -18127,12 +18674,66 @@ msgstr "Tierarzt"
msgid "Edit Veterinary"
msgstr "Tierarzt bearbeiten"
-msgid "Drinking water"
-msgstr "Wasserspender"
+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"
@@ -18142,6 +18743,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"
@@ -18151,30 +18776,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 "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"
@@ -18203,8 +18834,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"
@@ -18230,21 +18861,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 "plastic"
-msgstr "Kunststoff"
-
msgid "Amount of Seats"
msgstr "Anzahl der Sitzplätze"
@@ -18279,18 +18904,24 @@ 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"
+
msgid "Hide"
msgstr "Versteck"
msgid "Lock"
msgstr "Schloss"
-msgid "Drinking Water"
-msgstr "Trinkwasser"
-
msgid "Edit Source of Potable Water"
msgstr "Wasserspender bearbeien"
@@ -18322,6 +18953,9 @@ msgstr "Teich"
msgid "Diameter (in mm)"
msgstr "Durchmesser (in mm)"
+msgid "Hydrant Position"
+msgstr "Hydrantposition"
+
msgctxt "hydrant position"
msgid "lane"
msgstr "Fahrbahn"
@@ -18359,117 +18993,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"
@@ -18503,33 +19173,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"
@@ -18563,6 +19243,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"
@@ -18619,7 +19315,7 @@ msgid "Skating"
msgstr "Eislaufen"
msgid "Edit Skating"
-msgstr "Eislaufbahn bearbeiten"
+msgstr "Eislaufen bearbeiten"
msgid "ice_rink"
msgstr "Eisbahn"
@@ -18663,36 +19359,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"
@@ -18735,19 +19449,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"
@@ -18886,6 +19596,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"
@@ -18898,59 +19620,133 @@ 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 "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"
@@ -19176,42 +19972,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"
@@ -19219,7 +20041,7 @@ msgstr "Vermessungspunkt"
msgid "Edit Survey Point"
msgstr "Vermessungspunkt bearbeiten"
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr "Überwachungskamera"
msgid "Edit Surveillance Camera"
@@ -19231,11 +20053,103 @@ 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 "Power"
-msgstr "Energieversorgung"
+msgid "vacuum"
+msgstr "Vacuum"
msgid "Power Generator"
msgstr "Stromgenerator"
@@ -19288,89 +20202,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 "battery charging"
-msgstr "Batterieaufladung"
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr "Siedewasserreaktor 5 (SWR-5)"
-msgid "Power Station"
-msgstr "Umspannwerk"
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr "Siedewasserreaktor 6 (SWR-6)"
-msgid "Edit Power Station"
-msgstr "Umspannwerk bearbeiten"
+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 "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 "Wasser-Wasser-Energie-Reaktor (WWER)"
+
+msgid "Output forms of energy:"
+msgstr "Formen der abgegebenen Energie:"
msgid "Power Sub Station"
msgstr "Trafostation"
@@ -19381,6 +20398,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"
@@ -19396,6 +20428,9 @@ msgstr "Strommast bearbeiten"
msgid "Tower reference"
msgstr "Identifikation des Turms"
+msgid "steel"
+msgstr "Stahl"
+
msgid "Pole"
msgstr "Kleiner Freileitungsmast"
@@ -19414,13 +20449,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"
@@ -19527,11 +20560,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"
@@ -19542,7 +20575,7 @@ msgstr "Fleischer bearbeiten"
msgid "Seafood"
msgstr "Fischhändler"
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr "Fischhändler bearbeiten"
msgid "Deli (Fine Food)"
@@ -19563,6 +20596,9 @@ msgstr "Marktplatz"
msgid "Edit Marketplace"
msgstr "Marktplatz bearbeiten"
+msgid "Organic"
+msgstr "Bioladen"
+
msgid "Greengrocer"
msgstr "Obst- und Gemüseladen"
@@ -19575,9 +20611,6 @@ msgstr "Hofladen"
msgid "Edit Farm Stand"
msgstr "Hofladen bearbeiten"
-msgid "Organic"
-msgstr "Bioladen"
-
msgid "Edit Organic/Bio"
msgstr "Organisch/Biologisch bearbeiten"
@@ -19647,8 +20680,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"
@@ -19668,14 +20701,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"
@@ -19683,9 +20716,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"
@@ -19711,6 +20743,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"
@@ -19747,10 +20785,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"
@@ -19780,8 +20839,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"
@@ -19792,20 +20851,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"
@@ -19840,7 +20899,7 @@ msgstr "Reisebüro bearbeiten"
msgid "Musical Instrument"
msgstr "Musikhaus"
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr "Musikhaus bearbeiten"
msgid "Toys"
@@ -20053,6 +21112,12 @@ msgstr "Bergspitze"
msgid "Edit Peak"
msgstr "Bergspitze bearbeiten"
+msgid "Saddle"
+msgstr "Sattelpunkt"
+
+msgid "Edit Saddle"
+msgstr "Sattelpunkt bearbeiten"
+
msgid "Glacier"
msgstr "Gletscher"
@@ -20092,24 +21157,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"
@@ -20119,15 +21193,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"
@@ -20206,6 +21271,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"
@@ -20260,7 +21331,7 @@ msgstr "Erholungsgebiet"
msgid "Edit Recreation Ground Landuse"
msgstr "Erholungsgebiet bearbeiten"
-msgid "Residential area"
+msgid "Residential Area"
msgstr "Wohngebiet"
msgid "Edit Residential Landuse"
@@ -20272,6 +21343,9 @@ msgstr "Kleiner Friedhof"
msgid "Edit Graveyard"
msgstr "Kleinen Friedhof bearbeiten"
+msgid "shinto"
+msgstr "schintoistisch"
+
msgid "Cemetery"
msgstr "Friedhof"
@@ -20347,6 +21421,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"
@@ -20363,7 +21464,7 @@ msgid "City name"
msgstr "Ortsname"
msgid "Country code"
-msgstr "Länderkennung"
+msgstr "Ländercode"
msgid "Address Interpolation"
msgstr "Adressinterpolation"
@@ -20383,6 +21484,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)"
@@ -20551,21 +21664,50 @@ msgstr "Route (Allgemein)"
msgid "Edit general route"
msgstr "Allgemeine Route bearbeiten"
+msgctxt "route type"
+msgid "bicycle"
+msgstr "Fahrrad"
+
+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"
@@ -20611,21 +21753,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"
@@ -20647,7 +21792,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)"
@@ -20743,18 +21888,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"
@@ -20764,19 +21918,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"
@@ -20794,6 +21951,9 @@ msgstr "Stromschnelle"
msgid "railwaypoint"
msgstr "Gleispunkt"
+msgid "raildashed"
+msgstr "Eisenbahn"
+
msgid "railyard"
msgstr "Gleisgelände"
@@ -20809,28 +21969,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"
@@ -20851,20 +22011,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"
@@ -20938,10 +22098,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"
@@ -20956,9 +22119,6 @@ msgstr "Stadt"
msgid "One Way"
msgstr "Einbahnstraße"
-msgid "Church"
-msgstr "Kirche"
-
msgid "Fuel Station"
msgstr "Tankstelle"
@@ -20986,6 +22146,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"
@@ -21031,11 +22194,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"
@@ -21046,8 +22239,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"
@@ -21064,8 +22257,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"
@@ -21154,48 +22347,162 @@ msgstr "Schlüssel ''tracks'' ohne Gleise"
msgid "traffic_mode without railway"
msgstr "Schlüssel ''traffic_mode'' ohne Gleise"
-msgid "usage without railway"
-msgstr "Schlüssel ''usage'' ohne Gleise"
+msgid "usage without railway"
+msgstr "Schlüssel ''usage'' ohne Gleise"
+
+msgid "workrules without railway"
+msgstr "Schlüssel ''workrules'' ohne Gleise"
+
+msgid "stream without waterway"
+msgstr "Bach ohne Wasserweg"
+
+msgid "intermittent without waterway"
+msgstr "Schlüssel ''intermittent'' ohne Wasserstraße"
+
+msgid "boat without waterway / natural=water"
+msgstr "Boot ohne Wasser/Wasserweg"
+
+msgid "length_unit without waterway"
+msgstr "Längeneinheit ohne Wasserweg"
+
+msgid "llid without waterway"
+msgstr "Schlüssel ''llid'' ohne Wasserstraße"
+
+msgid "canal without waterway"
+msgstr "Kanal ohne Wasserweg"
+
+msgid "have_riverbank without waterway"
+msgstr "Schlüssel ''have_riverbank'' ohne Wasserstraße"
+
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr "Tunnel ohne Straße/Eisenbahn/Wasserweg/Plattform/Pipeline"
+
+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/parking"
+msgstr "Schlüssel ''psv'' ohne Straße/Eisenbahn/Wasserweg/Parkplatz"
+
+msgid "width without physical linear feature"
+msgstr "Breite ohne physische Linie"
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+"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 "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 "workrules without railway"
-msgstr "Schlüssel ''workrules'' ohne Gleise"
+msgid "source:postal_code without addr:postcode"
+msgstr "Schlüssel ''source:postal_code'' ohne Postleitzahl (addr:postcode)"
-msgid "stream without waterway"
-msgstr "Bach ohne Wasserweg"
+msgid "source:ele without ele"
+msgstr "Schlüssel ''source:ele'' ohne Höhenangabe (ele)"
-msgid "intermittent without waterway"
-msgstr "Schlüssel ''intermittent'' ohne Wasserstraße"
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr "Schlüssel ''source:ref:INSEE'' ohne Schlüssel ''ref:INSEE''"
-msgid "boat without waterway / natural=water"
-msgstr "Boot ohne Wasser/Wasserweg"
+msgid "source:lit without lit"
+msgstr "Schlüssel ''source:lit'' ohne Beleuchtung (lit)"
-msgid "length_unit without waterway"
-msgstr "Längeneinheit ohne Wasserweg"
+msgid "source:hgv without hgv"
+msgstr "Schlüssel ''source:hgv'' ohne LKW (hgv)"
-msgid "llid without waterway"
-msgstr "Schlüssel ''llid'' ohne Wasserstraße"
+msgid "source:outline on a node"
+msgstr "Schlüssel ''source:outline'' an einem Punkt"
-msgid "canal without waterway"
-msgstr "Kanal ohne Wasserweg"
+msgid "source:highway without highway"
+msgstr "Schlüssel ''source:highway'' ohne Straßenmerkmal (highway)"
-msgid "have_riverbank without waterway"
-msgstr "Schlüssel ''have_riverbank'' ohne Wasserstraße"
+msgid "source:maxaxleload without maxaxleload"
+msgstr "Schlüssel ''source:maxaxleload'' ohne max. Achslast (maxaxleload)"
-msgid "tunnel without highway/railway/waterway"
-msgstr "Tunnel ohne Straßen, Wasserstraßen, Gleise"
+msgid "source:surface without surface"
+msgstr "Schlüssel ''source:surface'' ohne Oberfläche (surface)"
-msgid "bridge without highway/railway/waterway"
-msgstr "Brücke ohne Straßen, Wasserstraßen, Gleise"
+msgid "source:bridge without bridge"
+msgstr "Schlüssel ''source:bridge'' ohne Brücke (bridge)"
-msgid "psv without highway/railway/waterway"
-msgstr "Schlüssel ''psv'' ohne Straßen, Wasserstraßen, Gleise"
+msgid "source:old_name without old_name"
+msgstr "Schlüssel ''source:old_name'' ohne alten Namen (old_name)"
-msgid "width without physical linear feature"
-msgstr "Breite ohne physische Linie"
+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 "maxspeed without highway/railway/traffic_sign"
+msgid "source:[addr:]housenumber without addr:housenumber"
msgstr ""
-"Schlüssel ''maxspeed'' ohne Straßen, Wasserstraßen, Gleise, Verkehrsschilder"
+"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"
@@ -21215,9 +22522,59 @@ 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 "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 "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"
@@ -21227,20 +22584,29 @@ msgstr "Yahoo-Satelitenbilder"
msgid "Bing Sat"
msgstr "Bing-Satelitenbilder"
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr "HDDM (Humanitarian OpenStreetMap)"
+
msgid "MapBox Satellite"
msgstr "MapBox-Satellitenbilder"
msgid "MapQuest Open Aerial"
msgstr "MapQuest offene Luftbilder"
+msgid "OpenStreetMap GPS Traces"
+msgstr "OpenStreetMap GPS-Spuren"
+
msgid "OpenStreetMap (Mapnik)"
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 "skobbler heatmap"
msgstr "Skobbler Aktivitätskarte"
@@ -21260,8 +22626,8 @@ msgstr "OpenStreetMap (Deutscher Stil)"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Kambodscha, Laos, Thailand, Vietnam - zweisprachig"
-msgid "2u"
-msgstr "2u"
+msgid "osmfr"
+msgstr "osmfr"
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI Schwarz/Weiß 2.5m"
@@ -21269,6 +22635,9 @@ msgstr "AGRI Schwarz/Weiß 2.5m"
msgid "Geoimage.at MaxRes"
msgstr "Geoimage.at Höchste Auflösung"
+msgid "basemap.at"
+msgstr "basemap.at"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte"
@@ -21417,6 +22786,32 @@ 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)"
@@ -21582,6 +22977,9 @@ msgstr "USGS Groß skalierte Bilder"
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr "OSM US TIGER 2012 Straßen"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr "Neue & falsch ausgerichtete TIGER-Straßen (TIGER 2013)"
+
msgid "OSM - Tiger Edited Map"
msgstr "OSM - Tiger bearbeitete Karte"
@@ -21627,6 +23025,39 @@ msgstr "OS Schottisch Popular historisch"
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 "delete data after import"
+msgstr "Daten nach Import löschen"
+
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV-Dateien"
@@ -21838,6 +23269,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."
@@ -21859,14 +23302,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}''."
@@ -22142,11 +23579,14 @@ 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 "Housenumber increment:"
-msgstr "Hausnummernerhöhung:"
+msgid "House number increment:"
+msgstr "Hausnummern-Schrittweite"
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
@@ -22357,8 +23797,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"
@@ -22734,15 +24174,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"
@@ -22936,6 +24367,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."
@@ -22955,12 +24389,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "hoch"
-
-msgid "medium"
-msgstr "mittel"
-
msgid "symbol"
msgstr "Symbol"
@@ -23112,6 +24540,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:"
@@ -23132,6 +24565,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?"
@@ -23384,8 +24820,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."
@@ -23439,7 +24878,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"
@@ -23671,27 +25110,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."
@@ -24856,9 +26277,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"
@@ -25081,7 +26528,7 @@ msgid "ODS files"
msgstr "ODS-Dateien"
msgid "Shapefiles"
-msgstr "Formdateien"
+msgstr "Shape-Dateien"
msgid "MapInfo files"
msgstr "MapInfo-Dateien"
@@ -25321,7 +26768,7 @@ 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."
@@ -25589,9 +27036,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 "Process queue"
msgstr "Warteschlange abarbeiten"
@@ -25650,18 +27094,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"
@@ -26014,6 +27446,29 @@ msgstr "Test fehlgeschlagen: mtime konnte nicht gelesen werden."
msgid "Test failed: Could not write mtime."
msgstr "Test fehlgeschlagen: mtime konnte nicht geschrieben werden."
+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 ""
"Sollen die aktuellen Kalibrierdaten der Ebene {0} gespeichert werden?"
@@ -26170,6 +27625,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"
@@ -26181,7 +27640,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?"
@@ -26491,9 +27950,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:"
@@ -26715,6 +28171,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}"
@@ -26751,15 +28210,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:"
@@ -26874,9 +28353,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)"
@@ -27084,20 +28560,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"
@@ -27322,6 +28798,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"
@@ -27362,6 +28935,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..."
@@ -27529,9 +29106,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:"
@@ -28491,13 +30065,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> "
@@ -28686,9 +30260,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"
@@ -28996,9 +30567,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 f4f9d65..f60f7b7 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-08-04 03:41+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-08-05 05:08+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -163,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 "
@@ -265,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."
@@ -304,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"
@@ -360,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"
@@ -544,6 +543,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -657,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 ""
@@ -807,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"
@@ -993,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 ""
@@ -1016,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>"
@@ -1184,9 +1179,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1325,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"
@@ -1420,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 ""
@@ -1704,6 +1717,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1923,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] ""
@@ -2349,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 ""
@@ -2545,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 ""
@@ -2632,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 ""
@@ -2668,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"
@@ -2694,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}''"
@@ -2799,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] ""
@@ -2859,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"
@@ -2890,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"
@@ -2914,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 ""
@@ -2944,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 ""
@@ -2964,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 ""
@@ -2973,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 ""
@@ -2993,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}"
@@ -3024,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}''."
@@ -3181,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 ""
@@ -3289,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 ""
@@ -3327,9 +3350,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3368,6 +3388,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3392,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 ""
@@ -3451,6 +3483,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3533,6 +3568,15 @@ 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 ""
@@ -3602,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 ""
@@ -3659,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})"
@@ -3697,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}"
@@ -3834,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"
@@ -3909,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 ""
@@ -3939,9 +3992,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3966,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''"
@@ -4032,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 ""
@@ -4152,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"
@@ -4381,6 +4414,18 @@ 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 ""
@@ -4485,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 ""
@@ -4785,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 "> 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"
@@ -4822,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"
@@ -4874,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 ""
@@ -5131,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 ""
@@ -5659,6 +5701,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5742,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 ""
@@ -5832,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 ""
@@ -6003,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 ""
@@ -6290,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"
@@ -6356,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"
@@ -6398,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)"
@@ -6558,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"
@@ -6876,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 ""
@@ -7007,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, "
@@ -7031,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 ""
@@ -7147,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."
@@ -7246,6 +7318,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7333,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"
@@ -7352,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 ""
@@ -7418,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"
@@ -7494,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 ""
@@ -7509,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"
@@ -7725,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 "
@@ -7739,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 ""
@@ -7754,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 ""
@@ -7761,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 ..."
@@ -7874,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] ""
@@ -7886,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>"
@@ -7902,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:"
@@ -8048,7 +8152,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8078,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"
@@ -8431,9 +8535,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8452,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 ""
@@ -8509,6 +8613,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8575,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 ""
@@ -8758,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}''..."
@@ -8780,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"
@@ -8790,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:"
@@ -9011,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}''"
@@ -9726,6 +9828,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9794,6 +9929,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9847,6 +9985,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 ""
@@ -10303,6 +10446,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 ""
@@ -10366,7 +10515,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 ""
@@ -10624,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}''"
@@ -10710,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:"
@@ -10720,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 ""
@@ -10815,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"
@@ -10895,7 +11043,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10974,9 +11122,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10995,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 ""
@@ -11024,9 +11177,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 ""
@@ -11057,7 +11250,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 ""
@@ -11097,28 +11290,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..."
@@ -11213,6 +11404,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11228,12 +11422,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}."
@@ -11312,7 +11514,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11411,35 +11613,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 ""
@@ -11449,8 +11627,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 ..."
@@ -11477,10 +11655,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>"
@@ -11564,8 +11739,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}."
@@ -11762,7 +11937,7 @@ 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}"
@@ -11808,6 +11983,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."
@@ -11838,19 +12022,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 ""
@@ -11872,11 +12056,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 ""
@@ -11946,13 +12142,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}''"
@@ -12095,10 +12291,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"
@@ -12113,22 +12309,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}''"
@@ -12197,8 +12392,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..."
@@ -12213,9 +12407,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}''"
@@ -12537,12 +12746,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12553,27 +12761,70 @@ 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 "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 "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 ""
+
+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"
@@ -12587,9 +12838,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."
@@ -12915,6 +13180,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 ""
@@ -13154,6 +13424,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."
@@ -13203,9 +13476,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 ""
@@ -13242,6 +13512,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 ""
@@ -13372,6 +13647,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13462,6 +13740,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 ""
@@ -13480,10 +13802,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13495,6 +13817,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13522,18 +13847,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 ""
@@ -13543,9 +13862,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13555,13 +13871,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13609,6 +13925,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13693,6 +14012,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13797,21 +14119,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 ""
@@ -13827,10 +14158,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"
@@ -13866,7 +14197,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13935,12 +14266,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 ""
@@ -13956,15 +14293,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 ""
@@ -13986,6 +14314,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13995,6 +14332,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -14004,10 +14344,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14040,9 +14377,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14082,7 +14416,19 @@ msgstr ""
msgid "Edit Block"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
msgstr ""
msgid "Bollard"
@@ -14100,6 +14446,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14169,19 +14518,16 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
-msgstr ""
-
-msgid "split_rail"
+msgid "pole"
msgstr ""
-msgid "chain"
+msgid "Guard Rail"
msgstr ""
-msgid "hedge"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14212,6 +14558,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14221,10 +14568,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14278,12 +14625,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14344,12 +14685,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14389,9 +14739,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14425,6 +14772,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 ""
@@ -14506,18 +14868,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 ""
@@ -14593,7 +14960,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14617,10 +14984,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"
@@ -14632,9 +15002,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14686,6 +15053,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14698,6 +15068,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14809,11 +15214,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14825,11 +15228,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14848,10 +15249,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14881,9 +15282,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14905,28 +15303,47 @@ 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 "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 "Fuel"
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
msgstr ""
-msgid "Edit Fuel"
+msgid "sunrise-sunset"
msgstr ""
-msgid "Brand"
+msgid "Su 10:00+"
msgstr ""
-msgid "Agip"
+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"
+msgstr ""
+
+msgid "Edit Fuel"
+msgstr ""
+
+msgid "Brand"
+msgstr ""
+
+msgid "Agip"
msgstr ""
msgid "Aral"
@@ -15058,6 +15475,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15079,6 +15499,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15106,6 +15532,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15130,22 +15562,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 ""
@@ -15167,9 +15583,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15364,6 +15777,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15394,6 +15810,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15406,9 +15825,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15418,9 +15834,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15433,6 +15854,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15457,14 +15881,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15513,7 +15929,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15567,41 +15983,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"
@@ -15793,9 +16209,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15817,9 +16230,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15832,6 +16251,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15871,6 +16293,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15892,22 +16317,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"
@@ -16037,49 +16474,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"
@@ -16097,6 +16528,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16109,6 +16546,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16127,37 +16567,137 @@ 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"
@@ -16247,6 +16787,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 ""
@@ -16328,83 +16874,167 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+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"
+msgstr ""
+
+msgid "Shows barometric pressure"
+msgstr ""
+
+msgid "Shows humidity"
+msgstr ""
+
+msgid "Recycling"
+msgstr ""
+
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16431,21 +17061,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 "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16480,16 +17104,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16523,6 +17153,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16560,117 +17193,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 ""
@@ -16704,33 +17373,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 ""
@@ -16764,6 +17443,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 ""
@@ -16864,36 +17559,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 ""
@@ -16936,19 +17649,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 ""
@@ -17087,6 +17796,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 ""
@@ -17099,60 +17820,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 ""
@@ -17377,41 +18172,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"
@@ -17420,7 +18241,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17432,12 +18253,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 ""
@@ -17489,88 +18400,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"
+msgid "biomass / waste"
msgstr ""
-msgid "pumped-storage"
-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 "battery charging"
+msgid "Boiling Water Reactor 5 (BWR-5)"
msgstr ""
-msgid "Power Station"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17582,6 +18596,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 ""
@@ -17597,6 +18626,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17615,11 +18647,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17728,10 +18758,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17743,7 +18773,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17764,6 +18794,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17776,9 +18809,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17848,7 +18878,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17869,13 +18899,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"
@@ -17884,7 +18914,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17912,6 +18941,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17948,10 +18983,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"
@@ -17981,7 +19037,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17993,19 +19049,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"
@@ -18041,7 +19097,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18254,6 +19310,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18293,24 +19355,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 ""
@@ -18320,15 +19391,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18404,6 +19466,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18458,7 +19526,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18470,6 +19538,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18506,43 +19577,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18581,6 +19679,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18749,21 +19859,50 @@ 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 ""
+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,19 +19948,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"
@@ -18845,7 +19987,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18941,18 +20083,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 ""
@@ -18962,7 +20113,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18971,10 +20125,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18992,6 +20146,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19007,28 +20164,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"
@@ -19049,19 +20206,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"
@@ -19136,10 +20293,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19154,9 +20314,6 @@ msgstr "Dorf/Stadt"
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19184,6 +20341,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19229,10 +20389,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"
@@ -19244,7 +20434,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"
@@ -19262,7 +20452,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19379,19 +20569,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 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"
@@ -19410,7 +20711,46 @@ 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 "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 "Landsat"
@@ -19422,19 +20762,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 "skobbler heatmap"
@@ -19455,7 +20804,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19464,6 +20813,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19610,6 +20962,29 @@ 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 ""
@@ -19775,6 +21150,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19820,6 +21198,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -20006,19 +21417,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20042,13 +21465,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20311,10 +21728,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20518,7 +21938,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"
@@ -20789,15 +22209,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20970,6 +22381,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 ""
@@ -20988,12 +22402,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21129,6 +22537,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 ""
@@ -21146,6 +22557,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 ""
@@ -21374,7 +22788,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."
@@ -21424,7 +22841,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21609,6 +23026,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21648,27 +23130,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 ""
@@ -22746,9 +24210,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 ""
@@ -23395,9 +24876,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23450,18 +24928,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 ""
@@ -23808,6 +25274,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23959,6 +25446,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 ""
@@ -24276,9 +25766,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24494,6 +25981,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 ""
@@ -24526,15 +26016,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 ""
@@ -24649,9 +26155,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24830,19 +26333,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"
@@ -25058,6 +26561,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 ""
@@ -25094,6 +26686,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..."
@@ -25246,9 +26841,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26234,9 +27826,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26515,9 +28104,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 c1e9922..1eb68ee 100644
--- a/i18n/po/el.po
+++ b/i18n/po/el.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-04 03:41+0200\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"
@@ -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-08-25 04:31+0000\n"
-"X-Generator: Launchpad (build 16738)\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"
@@ -51,6 +51,9 @@ msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
"Το άνοιγμα δεσμού δεν υποστηρίζεται στην τρέχουσα πλατφόρμα (''{0}'')"
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: {0}"
@@ -60,6 +63,9 @@ msgstr "ΠΛΗΡΟΦΟΡΙΕΣ: {0}"
msgid "DEBUG: {0}"
msgstr "ΑΠΟΣΦΑΛΜΑΤΩΣΗ: {0}"
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -164,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 "
@@ -267,9 +267,6 @@ msgstr "Εργαλείο: {0}"
msgid "Please select at least four nodes."
msgstr "Παρακαλώ επιλέξτε τουλάχιστον τέσσερεις κόμβους."
-msgid "Information"
-msgstr "Πληροφορίες"
-
msgid "Align Nodes in Line"
msgstr "Ευθυγράμμιση κόμβων"
@@ -306,6 +303,9 @@ msgstr "επόμενο"
msgid "Nothing selected to zoom to."
msgstr "Δεν υπάρχει επιλογή στην οποία να γίνει ζουμ."
+msgid "Information"
+msgstr "Πληροφορίες"
+
msgid "Zoom to {0}"
msgstr "Εστίαση στ(ο,α,η) {0}"
@@ -362,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} διαδρομές"
@@ -555,6 +553,9 @@ msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
"Εμφάνιση πληροφοριών ιστορικού σχετικά με διαδρομές, κόμβους ή σχέσεις OSM."
+msgid "Show history"
+msgstr "Προβολή ιστορικού"
+
msgid "History (web)"
msgstr "Ιστορικό (ιστός)"
@@ -688,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 "Διόρθωση συγκρούσεων ετικετών"
@@ -862,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 "Ακύρωση Συγχώνευσης"
@@ -1066,17 +1063,13 @@ 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 "
"undesirable results when doing rectangular alignments.<br>Change your "
@@ -1092,9 +1085,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>"
@@ -1273,9 +1263,6 @@ msgstr "Φόρτωση Συνεδρίας"
msgid "Load a session from file."
msgstr "Φόρτωση συνεδρίας από αρχείο."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Αρχείο συνεδρίας (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Άνοιγμα συνεδρίας"
@@ -1429,13 +1416,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"
@@ -1536,6 +1523,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 "Αναίρεση"
@@ -1832,6 +1840,9 @@ 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})"
@@ -2066,10 +2077,10 @@ 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"
-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 ""
@@ -2513,6 +2524,9 @@ msgstr "''τιμή'' δε οποιοδήποτε κλειδί"
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2709,8 +2723,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 ""
@@ -2801,6 +2814,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}"
@@ -2837,11 +2853,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 ""
-msgid "Set {0} properties for {1} objects"
-msgstr "Ορισμός {0} ιδιοτήτων για {1} αντικείμενα"
+msgid "Set {0} tags for {1} objects"
+msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "Αντικατάσταση \"{0}\" με \"{1}\" για"
@@ -2865,11 +2881,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}''"
@@ -2986,6 +3000,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} κόμβου"
@@ -3046,12 +3063,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 "Σχέση"
@@ -3080,11 +3094,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 "Ρόλοι σε σχέσεις που αναφέροντε στο"
@@ -3107,6 +3121,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 ""
@@ -3137,18 +3154,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 ""
@@ -3157,8 +3174,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 ""
@@ -3166,13 +3183,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 ""
@@ -3186,8 +3201,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}"
@@ -3218,11 +3233,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}''."
@@ -3375,8 +3389,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 ""
@@ -3483,7 +3496,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3521,9 +3534,6 @@ msgstr ""
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr "WGS84"
@@ -3564,6 +3574,9 @@ msgstr "άλλο επαλήθευσης"
msgid "Running test {0}"
msgstr "Εκτέλεση δοκιμής {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Διευθύνσεις"
@@ -3588,6 +3601,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 "Κτήριο εντός κτηρίου"
@@ -3649,6 +3671,9 @@ msgstr " ή "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0} είναι παρωχημένες, χρησιμοποίησε {1} αντί αυτών"
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Διπλασιασμένοι κόμβοι"
@@ -3733,6 +3758,15 @@ 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 "Πολύ-πολύγωνο"
@@ -3803,6 +3837,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 "Αλληλεπικαλυπτόμενες περιοχές"
@@ -3860,15 +3900,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 ""
@@ -3902,12 +3942,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 ""
@@ -4045,8 +4084,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 "Δεν βρέθηκε ο τύπος του στοιχείου"
@@ -4120,6 +4159,9 @@ msgstr "Ανοικτές Διαδρομές"
msgid "This tests if ways which should be circular are closed."
msgstr "Ελέγχει εάν διαδρομές που πρέπει να είναι κυκλικές είναι κλειστές."
+msgid "Unclosed way"
+msgstr "Ανοικτή διαδρομή"
+
msgid "natural type {0}"
msgstr ""
@@ -4150,9 +4192,6 @@ msgstr "κτίριο"
msgid "area"
msgstr "περιοχή"
-msgid "Unclosed way"
-msgstr "Ανοικτή διαδρομή"
-
msgid "Unconnected ways"
msgstr "Ασύνδετες διαδρομές"
@@ -4181,12 +4220,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''"
@@ -4250,28 +4289,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 "Να μην εμφανιστεί ξανά (απομνημόνευση επιλογής)"
@@ -4375,7 +4392,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"
@@ -4616,6 +4633,18 @@ 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 "Ήχος"
@@ -4720,19 +4749,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)"
@@ -5036,29 +5052,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"
@@ -5073,8 +5107,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 "Κάτω"
@@ -5126,14 +5160,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 "Κόμβος"
@@ -5383,14 +5409,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 ""
@@ -5917,6 +5943,9 @@ msgstr "Εμφάνιση/Απόκρυψη"
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -6000,6 +6029,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 "Σχέσεις"
@@ -6094,8 +6154,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 ""
@@ -6274,9 +6333,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 "Λήψη και προβολή ιστορικού των επιλεγμένων αντικειμένων"
@@ -6565,8 +6621,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"
@@ -6631,35 +6687,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 "Αλλαγή σχέσης"
@@ -6673,15 +6741,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 ""
@@ -6835,7 +6903,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"
@@ -7159,6 +7227,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 "Σελιδοδείκτες"
@@ -7297,21 +7386,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, "
@@ -7321,25 +7397,7 @@ 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."
+msgid "Download referrers (parent relations and ways)"
msgstr ""
msgid "Class Type"
@@ -7438,7 +7496,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."
@@ -7539,6 +7597,9 @@ msgstr ""
"<html>Έκδοση <strong>{0}</strong> δημιουργήθηκε στις "
"<strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr "Πληροφορίες ομάδας αλλαγών"
@@ -7634,7 +7695,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"
@@ -7653,6 +7714,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 "Αναγνωριστικό ομάδας αλλαγών:"
@@ -7721,8 +7788,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"
@@ -7797,8 +7863,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 ""
@@ -7812,8 +7878,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"
@@ -8039,12 +8104,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 "
@@ -8059,6 +8118,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 ""
@@ -8074,6 +8149,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 ""
@@ -8081,11 +8171,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 ""
@@ -8214,9 +8302,6 @@ msgstr ""
"Το αντικείμενο ''{0}'' είναι ήδη διαγραμμένο. Παράλειψη αντικειμένου κατά "
"την αποστολή."
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Αποστολή {0} αντικειμένου..."
@@ -8226,6 +8311,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>"
@@ -8242,7 +8330,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:"
@@ -8389,7 +8477,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8419,7 +8507,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"
@@ -8773,9 +8861,6 @@ msgstr "Εξαγωγή τοποθεσιών GPS από EXIF"
msgid "Starting directory scan"
msgstr "Έναρξη σάρωσης καταλόγου"
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr "Ανάγνωση φωτογραφιών"
@@ -8794,6 +8879,9 @@ msgstr "Βρέθηκε μηδενικό αρχείο στον κατάλογο {
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 ""
@@ -8851,6 +8939,12 @@ msgstr "Επόμενο"
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "Κεντράρισμα επιπέδου"
@@ -8921,9 +9015,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 ""
@@ -9109,14 +9200,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}''..."
@@ -9131,7 +9218,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"
@@ -9141,8 +9228,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:"
@@ -9362,7 +9448,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}''"
@@ -10065,6 +10151,45 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "imagery"
+msgstr ""
+
+msgid "Reset preferences"
+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 "Load profile"
+msgstr ""
+
+msgid "Save {0} profile"
+msgstr ""
+
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
+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 "Select Setting Type:"
msgstr ""
@@ -10155,6 +10280,9 @@ msgstr "Σχεδιασμός εικονικών κόμβων σε κατάστα
msgid "Draw inactive layers in other color"
msgstr "Σχεδιασμός ανενεργών επιπέδων με άλλο χρώμα"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -10209,6 +10337,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 ""
@@ -10679,6 +10812,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 "Εφεδρικά αρχεία"
@@ -10742,7 +10881,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 ""
@@ -11002,21 +11141,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"
@@ -11038,6 +11162,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 ""
@@ -11089,8 +11228,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:"
@@ -11099,20 +11238,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 "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 ""
@@ -11200,16 +11344,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 ""
@@ -11280,8 +11418,8 @@ msgstr "Εφαρμογή Προεπιλογής"
msgid "New relation"
msgstr "Νέα σχέση"
-msgid "Change Properties"
-msgstr "Αλλαγή ιδιοτήτων"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -11344,11 +11482,11 @@ msgstr ""
msgid "Unknown type: {0}"
msgstr "Άγνωστος τύπος: {0}"
-msgid "Preset group {1} / {0}"
-msgstr "Προεπιλογές ομάδας {1} / {0}"
+msgid "Could not read tagging preset source: {0}"
+msgstr ""
-msgid "Preset group {0}"
-msgstr "Προεπιλογές ομάδας {0}"
+msgid "Error parsing {0}: "
+msgstr "Σφάλμα ανάλυσης {0}: "
msgid "Roles cannot appear more than once"
msgstr ""
@@ -11359,9 +11497,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr "Σφάλμα ανάλυσης {0}: "
@@ -11380,6 +11515,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 ""
@@ -11409,9 +11552,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 ""
@@ -11442,7 +11625,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 ""
@@ -11482,28 +11665,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..."
@@ -11602,6 +11783,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11617,12 +11801,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}."
@@ -11701,8 +11893,8 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
-msgstr "Επιτυχία εισαγωγής NMEA"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "Αποτυχία εισαγωγής NMEA!"
@@ -11800,35 +11992,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 ""
@@ -11838,8 +12006,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 ..."
@@ -11866,10 +12034,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>"
@@ -11953,8 +12118,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}."
@@ -12153,7 +12318,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 "RemoteControl::Accepting connections on port {0}"
@@ -12202,7 +12373,16 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr "Ζητήθηκε από τον Τηλεχειρισμό να φορτώσει δεδομένα από το API:"
-msgid ""
+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."
msgstr ""
@@ -12236,19 +12416,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 ""
@@ -12270,11 +12450,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 ""
@@ -12344,13 +12536,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}''"
@@ -12498,10 +12690,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"
@@ -12516,22 +12708,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}''"
@@ -12608,8 +12799,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..."
@@ -12624,9 +12814,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}''"
@@ -12954,12 +13159,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12970,9 +13174,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 ""
@@ -13004,9 +13251,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."
@@ -13332,6 +13593,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 ""
@@ -13571,6 +13837,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."
@@ -13620,9 +13889,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 ""
@@ -13659,6 +13925,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 ""
@@ -13792,6 +14063,9 @@ msgstr "Ανάχωμα"
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "Διόδια"
+
msgid "Motorway Link"
msgstr ""
@@ -13882,6 +14156,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 ""
@@ -13900,10 +14218,10 @@ msgstr "Επιφάνεια"
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13915,6 +14233,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13942,18 +14263,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 "Αδιέξοδο"
@@ -13963,9 +14278,6 @@ msgstr ""
msgid "General Access"
msgstr "Γενική Πρόσβαση"
-msgid "destination"
-msgstr "προορισμός"
-
msgid "delivery"
msgstr "παράδοση"
@@ -13975,15 +14287,15 @@ msgstr ""
msgid "private"
msgstr "ιδιωτικό"
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr "αγροτικό"
msgid "forestry"
msgstr "δασικός"
-msgid "no"
-msgstr "όχι"
-
msgid "official"
msgstr ""
@@ -14029,6 +14341,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr "Μέσα Μαζικής Μεταφοράς (μμμ)"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Ελαχ. ταχύτητα (χαω)"
@@ -14113,6 +14428,9 @@ msgstr "Επεξεργασία Γέφυρας"
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -14217,20 +14535,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 ""
@@ -14247,10 +14574,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"
@@ -14286,7 +14613,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr "Μονόδρομος (ποδήλατα)"
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -14355,12 +14682,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 "Τύπος διάβασης πεζών"
@@ -14376,15 +14709,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 ""
@@ -14406,6 +14730,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr "Stop"
@@ -14415,6 +14748,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Μικρός Κυκλικός Κόμβος"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Κατεύθυνση"
@@ -14424,10 +14760,7 @@ msgstr "δεξιόστροφα"
msgid "Pedestrian Crossing"
msgstr "Διάβαση Πεζών"
-msgid "Edit Crossing"
-msgstr "Επεξεργασία Διάβασης Πεζών"
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14460,9 +14793,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14505,6 +14835,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr "Επιτρεπόμενα οχήματα:"
+msgid "Material"
+msgstr "Υλικό"
+
+msgid "stone"
+msgstr "πέτρα"
+
msgid "Bollard"
msgstr "στύλος"
@@ -14520,6 +14856,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr "πλαστικό"
+
msgid "Cycle Barrier"
msgstr ""
@@ -14589,19 +14928,16 @@ msgstr ""
msgid "electric"
msgstr "ηλεκτρικός"
-msgid "roundpole"
+msgid "pole"
msgstr ""
-msgid "split_rail"
+msgid "Guard Rail"
msgstr ""
-msgid "chain"
-msgstr "αλυσίδα"
-
-msgid "hedge"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14632,8 +14968,9 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
-msgstr "Επεξεργασία Χαντακιού"
+msgstr ""
msgid "Kerb"
msgstr ""
@@ -14641,11 +14978,11 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
-msgstr "Είσοδος"
+msgid "Entrance (barrier opening)"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Επεξεργασία Εισόδου"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Πύλη"
@@ -14698,12 +15035,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr "Υλικό"
-
-msgid "stone"
-msgstr "πέτρα"
-
msgid "Turnstile"
msgstr ""
@@ -14764,12 +15095,21 @@ msgstr "Επεξεργασία Αποχέτευσης"
msgid "Ditch"
msgstr "Χαντάκι"
+msgid "Edit Ditch"
+msgstr "Επεξεργασία Χαντακιού"
+
msgid "Stream"
msgstr "Υδατόρρευμα"
msgid "Edit Stream"
msgstr "Επεξεργασία Υδατορρεύματος"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Κανάλι"
@@ -14809,9 +15149,6 @@ msgstr "Επεξεργασία Φweirράγματος"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14845,6 +15182,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 "Ξηρά"
@@ -14926,20 +15278,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 "Δρομολόγιο Πορθμείου"
@@ -15013,7 +15370,7 @@ msgstr "τουρισμός"
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -15037,11 +15394,14 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
-msgstr "Τάση ρεύματος"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
-msgid "Frequency (Hz)"
-msgstr "Συχνότητα (Hz)"
+msgid "16.67"
+msgstr ""
msgid "16.7"
msgstr "16.7"
@@ -15052,9 +15412,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr "Τύποι"
-
msgid "Monorail"
msgstr ""
@@ -15106,6 +15463,9 @@ msgstr ""
msgid "Level Crossing"
msgstr "Ισόπεδη διάβαση"
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -15118,18 +15478,32 @@ msgstr ""
msgid "Barrier"
msgstr ""
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
msgid "half"
-msgstr "μισό"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "πλήρες"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "double_half"
msgstr ""
msgid "Crossing"
msgstr "Φυλασόμενη Διάβαση"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Είδος Διάβασης"
@@ -15229,11 +15603,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -15245,13 +15617,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Επεξεργασία σταθμού"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "Πυλώνας"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "Επεξεργασία Πυλώνα"
+msgstr ""
msgid "Parking"
msgstr "Χώρος στάθμευσης"
@@ -15268,12 +15638,12 @@ msgstr "επιφάνεια"
msgid "underground"
msgstr "υπόγειο"
+msgid "rooftop"
+msgstr ""
+
msgid "Access"
msgstr "Πρόσβαση"
-msgid "customers"
-msgstr ""
-
msgid "Park and Ride"
msgstr ""
@@ -15301,9 +15671,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Χωρητικότητα"
@@ -15325,11 +15692,30 @@ 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 "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Τρ-Κυ 08:00-15:00;Σα 08:00-12:00"
+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 ""
@@ -15478,6 +15864,9 @@ msgstr "Σταθμός φόρτισης"
msgid "Edit Charging Station (for electric cars)"
msgstr "Επεξεργασία Σταθμού Φόρτισης (για ηλεκτρικά αυτοκίνητα)"
+msgid "Voltage"
+msgstr "Τάση ρεύματος"
+
msgid "Amperage"
msgstr ""
@@ -15499,6 +15888,12 @@ msgstr "Συνεργείο Αυτοκινήτων"
msgid "Edit Car Repair"
msgstr "Επεξεργασία Συνεργείου Αυτοκινήτων"
+msgid "Parts"
+msgstr "Ανταλλακτικά"
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr "Ελαστικά"
@@ -15526,6 +15921,12 @@ msgstr "Ενοικίαση"
msgid "Edit Car Rental"
msgstr "Επεξεργασία Ενοικίασης"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "Κοινή χρήση"
@@ -15550,22 +15951,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 ""
@@ -15587,9 +15972,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr "Ανταλλακτικά"
-
msgid "Clothes"
msgstr "Ρούχα"
@@ -15784,6 +16166,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15814,6 +16199,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Παγκάκι"
@@ -15826,9 +16214,6 @@ msgstr "Αναπηρικό καρότσι"
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15838,8 +16223,13 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
-msgstr ""
+msgstr "Σταθμός τρένου"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Επεξεργασία σταθμού"
msgid "Building"
msgstr "Κτήριο"
@@ -15853,6 +16243,9 @@ msgstr "Επεξεργασία εισόδου υπογείου σιδηρόδρ
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15877,14 +16270,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr "Σταθμός τρένου"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Επεξεργασία σταθμού"
-
msgid "UIC-Reference"
msgstr ""
@@ -15933,8 +16318,8 @@ msgstr ""
msgid "Taxi"
msgstr "Ταξί"
-msgid "Edit Taxi station"
-msgstr "Επεξεργασία σταθμού ταξί"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Αεροδρόμιο"
@@ -15987,6 +16372,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 "Πύλη"
@@ -16009,21 +16409,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 "Κάπνισμα"
@@ -16213,9 +16598,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Τρ-Κυ 08:00-15:00; Σα 08:00-12:00"
-
msgid "Tourism"
msgstr "Τουρισμός"
@@ -16237,9 +16619,15 @@ msgstr "Πύργος Παρατήρησης"
msgid "Information Office"
msgstr "Γραφείο Πληροφοριών"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Χάρτης"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr "Βαθμός Λεπτομέρειας"
@@ -16252,6 +16640,9 @@ msgstr "οδός"
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -16291,6 +16682,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -16312,22 +16706,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"
@@ -16457,50 +16863,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 "Δόγμα"
@@ -16517,6 +16917,12 @@ msgstr "καθολικό"
msgid "evangelical"
msgstr "ευαγγελικό"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "μαρτύρων του Ιεχοβά"
@@ -16529,6 +16935,9 @@ msgstr "μεθοδισμός"
msgid "mormon"
msgstr "μορμόνοι"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ορθόδοξο"
@@ -16547,103 +16956,203 @@ msgstr "κουακέροι"
msgid "roman_catholic"
msgstr ""
-msgid "shia"
+msgid "russian_orthodox"
msgstr ""
-msgid "sunni"
+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 "Kindergarten"
-msgstr "Νηπιαγωγείο"
+msgid "shaivism"
+msgstr ""
-msgid "Edit Kindergarten"
-msgstr "Επεξεργασία Νηπιαγωγείου"
+msgid "shaktism"
+msgstr ""
-msgid "School"
-msgstr "Σχολείο"
+msgid "smartism"
+msgstr ""
-msgid "Edit School"
+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 "Νηπιαγωγείο"
+
+msgid "Edit Kindergarten"
+msgstr "Επεξεργασία Νηπιαγωγείου"
+
+msgid "School"
+msgstr "Σχολείο"
+
+msgid "Edit School"
msgstr "Επεξεργασία Σχολείου"
msgid "University"
@@ -16667,6 +17176,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 "Υγεία"
@@ -16748,12 +17263,66 @@ msgstr "Κτηνιατρίο"
msgid "Edit Veterinary"
msgstr "Επεξεργασία Κτηνιατρίου"
-msgid "Drinking water"
+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 "Τηλέφωνο"
@@ -16763,6 +17332,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 "Ρολόι"
@@ -16772,31 +17365,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 ""
@@ -16824,8 +17423,8 @@ msgstr ""
msgid "Recycling"
msgstr "Ανακύκλωση"
-msgid "Edit Recycling station"
-msgstr "Επεξεργασία σταθμού Ανακύκλωσης"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Μπαταρίες"
@@ -16851,21 +17450,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 "plastic"
-msgstr "πλαστικό"
-
msgid "Amount of Seats"
msgstr "Σύνολο Καθισμάτων"
@@ -16900,8 +17493,17 @@ msgstr ""
msgid "Height"
msgstr "Ύψος"
+msgctxt "height"
msgid "low"
-msgstr "χαμηλό"
+msgstr ""
+
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
msgid "Hide"
msgstr "Κρυψώνα"
@@ -16909,9 +17511,6 @@ msgstr "Κρυψώνα"
msgid "Lock"
msgstr "Κλειδαριά"
-msgid "Drinking Water"
-msgstr "Πόσιμο Νερό"
-
msgid "Edit Source of Potable Water"
msgstr ""
@@ -16943,6 +17542,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16980,119 +17582,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 "Αθλητικό Κέντρο"
@@ -17124,26 +17762,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 ""
@@ -17151,6 +17790,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr "αθλητικό κέντρο"
+
+msgid "stadium"
+msgstr "στάδιο"
+
msgid "10pin"
msgstr ""
@@ -17184,6 +17832,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 "Κυνοδρομίες"
@@ -17284,36 +17948,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 ""
@@ -17356,19 +18038,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 ""
@@ -17507,72 +18185,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"
-msgstr "Τεχνητά"
-
-msgid "Edit Building"
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
+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 "σπίτι"
+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 "Πύργος"
@@ -17797,42 +18561,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 "Edit Measurement Station"
-msgstr "Επεξεργασία Σταθμού Μέτρησης"
+msgid "Monitoring:"
+msgstr ""
-msgid "Measurement"
-msgstr "Μέτρηση"
+msgid "Weather"
+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 "Σημείο Επιτήρησης"
@@ -17840,8 +18630,8 @@ msgstr "Σημείο Επιτήρησης"
msgid "Edit Survey Point"
msgstr "Επεξεργασία Σημείου Επιτήρησης"
-msgid "Surveillance"
-msgstr "Παρακολούθηση"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Επεξεργασία Κάμερας Παρακολούθησης"
@@ -17852,12 +18642,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 "Γεννήτρια Ρεύματος"
@@ -17909,89 +18789,192 @@ 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 "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 "battery charging"
+msgid "stellarator"
msgstr ""
-msgid "Power Station"
-msgstr "Σταθμός Παραγωγής Ρεύματος"
+msgid "nuclear fusion"
+msgstr ""
-msgid "Edit Power Station"
-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 "Υποσταθμός Ρεύματος"
@@ -18002,6 +18985,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 "Κιβώτιο Διανομής Καλωδίων"
@@ -18017,6 +19015,9 @@ msgstr "Επεξεργασία Πυλώνα Ρεύματος"
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr "Στύλος ρεύματος"
@@ -18035,11 +19036,9 @@ msgstr "Επεξεργασία Αγωγού Μεταφοράς Ρεύματος"
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -18148,11 +19147,11 @@ msgstr "Περίπτερο"
msgid "Edit Kiosk"
msgstr "Επεξεργασία Περιπτέρου"
-msgid "Baker"
-msgstr "Φούρνος"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Επεξεργασία Φούρνου"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Κρεοπωλείο"
@@ -18163,8 +19162,8 @@ msgstr "Επεξεργασία Κρεοπωλείου"
msgid "Seafood"
msgstr "Ιχθυοπωλείο"
-msgid "Edit Seafood"
-msgstr "Επεξεργασία Ιχθυοπωλείου"
+msgid "Edit Seafood Shop"
+msgstr ""
msgid "Deli (Fine Food)"
msgstr "Ντελικατέσεν (εκλεκτά προϊόντα)"
@@ -18184,6 +19183,9 @@ msgstr "Αγορά"
msgid "Edit Marketplace"
msgstr "Επεξεργασία Αγοράς"
+msgid "Organic"
+msgstr "Βιολογικά"
+
msgid "Greengrocer"
msgstr "Μανάβικο"
@@ -18196,9 +19198,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr "Βιολογικά"
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -18268,8 +19267,8 @@ msgstr "Επεξεργασία Ραφείου"
msgid "Fabric"
msgstr "Ύφασμα"
-msgid "Edit Fabric"
-msgstr "Επεξεργασία καταστήματος Υφασμάτων"
+msgid "Edit Fabric Shop"
+msgstr ""
msgid "Electronic"
msgstr "Ηλεκτρονικά"
@@ -18289,13 +19288,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"
@@ -18304,7 +19303,6 @@ msgstr "Ηχοσυστήματα"
msgid "Edit Hifi Shop"
msgstr "Επεξεργασία Καταστήματος Ηχοσυστημάτων"
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -18332,6 +19330,12 @@ msgstr "Επεξεργασία Συναλλακτηρίου"
msgid "Edit Automated Teller Machine"
msgstr "Επεξεργασία ΑΤΜ"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr "Πολυκατάστημα"
@@ -18356,22 +19360,43 @@ msgstr "Κομμωτήριο"
msgid "Edit Hairdresser"
msgstr "Επεξεργασία Κομμωτηρίου"
-msgid "Optician"
-msgstr "Οπτικός"
+msgid "Optician"
+msgstr "Οπτικός"
+
+msgid "Edit Optician"
+msgstr "Επεξεργασία Οπτικού"
+
+msgid "Jewelry"
+msgstr "Κοσμηματοπωλείο"
+
+msgid "Edit Jewelry"
+msgstr "Επεξεργασία Κοσμηματοπωλείου"
+
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr "βουδισμός"
+
+msgid "christian"
+msgstr "χριστιανισμός"
-msgid "Edit Optician"
-msgstr "Επεξεργασία Οπτικού"
+msgid "hindu"
+msgstr "ινδουϊσμός"
-msgid "Jewelry"
-msgstr "Κοσμηματοπωλείο"
+msgid "jewish"
+msgstr "ιουδαϊσμός"
-msgid "Edit Jewelry"
-msgstr "Επεξεργασία Κοσμηματοπωλείου"
+msgid "muslim"
+msgstr "μουσουλμανισμός"
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -18401,8 +19426,8 @@ msgstr "Επεξεργασία Καταστήματος Σιδηρικών"
msgid "Paint"
msgstr "Χρώματα"
-msgid "Edit Paint"
-msgstr "Επεξεργασία Χρωματοπωλείου"
+msgid "Edit Paint Shop"
+msgstr ""
msgid "Furniture"
msgstr "Έπιπλα"
@@ -18413,20 +19438,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 "Χαρτικά"
@@ -18461,8 +19486,8 @@ msgstr "Επεξεργασία Ταξιδιωτικού Γραφείου"
msgid "Musical Instrument"
msgstr "Μουσικά Όργανα"
-msgid "Edit Musical Instruments"
-msgstr "Επεξεργασία Μουσικών Οργάνων"
+msgid "Edit Musical Instruments Shop"
+msgstr ""
msgid "Toys"
msgstr "Παιχνίδια"
@@ -18674,6 +19699,12 @@ msgstr "Κορυφή"
msgid "Edit Peak"
msgstr "Επεξεργασία κορυφής"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Παγετώνας"
@@ -18713,26 +19744,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 "Δάσος"
@@ -18740,15 +19780,6 @@ msgstr "Δάσος"
msgid "Edit Forest Landuse"
msgstr "Επεξεργασία Δάσους"
-msgid "coniferous"
-msgstr "Κωνοφόρο"
-
-msgid "deciduous"
-msgstr "φυλλοβόλα"
-
-msgid "mixed"
-msgstr "Μικτό"
-
msgid "Grassland"
msgstr ""
@@ -18824,6 +19855,12 @@ msgstr "Λειβάδι"
msgid "Edit Meadow Landuse"
msgstr "Επεξεργασία Λειβαδιού"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Αμπελώνας"
@@ -18878,8 +19915,8 @@ msgstr "Χώρος αναψυχής"
msgid "Edit Recreation Ground Landuse"
msgstr "Επεξεργασία χώρου αναψυχής"
-msgid "Residential area"
-msgstr "Οικιστική περιοχή"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "Επεξεργασία οικιστικής περιοχής"
@@ -18890,6 +19927,9 @@ msgstr "Νεκροταφείο"
msgid "Edit Graveyard"
msgstr "Επεξεργασία Νεκροταφείου"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Κοιμητήριο"
@@ -18965,6 +20005,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 "Επεξεργασία διεύθυνσης"
@@ -19001,6 +20068,18 @@ msgstr "Ζυγά"
msgid "alphabetic"
msgstr "αλφαβητικά"
+msgid "Accuracy"
+msgstr "Ακρίβεια"
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -19169,20 +20248,49 @@ msgstr ""
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 "Περιγραφή συμβόλου"
@@ -19229,21 +20337,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 "Οδός"
@@ -19265,7 +20376,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -19361,18 +20472,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 "άλογο"
@@ -19382,7 +20502,10 @@ msgstr ""
msgid "motorroad"
msgstr "αυτοκινητόδρομος"
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -19391,10 +20514,10 @@ msgstr ""
msgid "ford"
msgstr "κοιτόστρωση"
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -19412,6 +20535,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19427,29 +20553,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 "ενέργεια"
@@ -19469,20 +20595,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 "ξενοδοχείο"
@@ -19556,10 +20682,13 @@ msgstr "διαδρομή"
msgid "boundary"
msgstr "όριο"
+msgid "sport"
+msgstr "άθληση"
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19574,9 +20703,6 @@ msgstr "Χωριό/Πόλη"
msgid "One Way"
msgstr "Μονόδρομος"
-msgid "Church"
-msgstr "Εκκλησία"
-
msgid "Fuel Station"
msgstr "Σταθμός Καυσίμων"
@@ -19604,6 +20730,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19649,10 +20778,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"
@@ -19664,7 +20823,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"
@@ -19682,7 +20841,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19796,41 +20955,191 @@ msgstr ""
msgid "canal without waterway"
msgstr ""
-msgid "have_riverbank without waterway"
+msgid "have_riverbank without waterway"
+msgstr ""
+
+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 "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 ""
+
+msgid "unknown christian denomination"
+msgstr ""
+
+msgid "unknown muslim denomination"
+msgstr ""
+
+msgid "unknown jewish denomination"
+msgstr ""
+
+msgid ""
+"no wikipedia-language given, use ''wikipedia''=''language:page title''"
+msgstr ""
+
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "layer should be between -5 and 5"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
msgstr ""
-msgid "width without physical linear feature"
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
msgstr ""
-msgid "religion without denomination"
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
msgstr ""
-msgid "unknown christian denomination"
+msgid "unusual maxspeed format"
msgstr ""
-msgid "unknown muslim denomination"
+msgid "voltage should be in volts with no units/delimiter/spaces"
msgstr ""
-msgid "unknown jewish denomination"
+msgid "unusual frequency specification"
msgstr ""
-msgid ""
-"no wikipedia-language given, use ''wikipedia''=''language:page title''"
+msgid "unusual train track gauge; use mm with no separator"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unusual incline; use percentages/degrees or up/down"
msgstr ""
msgid "Landsat"
@@ -19842,19 +21151,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 "skobbler heatmap"
@@ -19875,7 +21193,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19884,6 +21202,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -20030,6 +21351,29 @@ 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 ""
@@ -20195,6 +21539,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -20240,6 +21587,39 @@ msgstr ""
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 "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 ""
@@ -20441,6 +21821,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 ""
@@ -20462,15 +21854,9 @@ msgstr ""
msgid "Time"
msgstr "Ώρα"
-msgid "Geoid"
+msgid "Tracks"
msgstr ""
-msgid "Automatic"
-msgstr "Αυτόματα"
-
-msgid "Fixed value"
-msgstr "Διορθωμένη τιμή"
-
msgid "Elevation profile for track ''{0}''."
msgstr ""
@@ -20733,10 +22119,13 @@ msgstr "Επιλογή ημιτελών διευθύνσεων"
msgid "Selects all addresses with incomplete data."
msgstr "Επιλέγει όλες τις διευθύνσεις με ημιτελή δεδομένα."
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20940,7 +22329,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"
@@ -21213,15 +22602,6 @@ msgstr "Αριθμός σπιτιού"
msgid "Street Name:"
msgstr "Όνομα Οδού:"
-msgid "Increment"
-msgstr "Αύξηση"
-
-msgid "Decrement"
-msgstr "Μείωση"
-
-msgid "Numbers:"
-msgstr "Αριθμοί:"
-
msgid "Big buildings mode"
msgstr ""
@@ -21392,6 +22772,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,12 +22794,6 @@ msgstr "50 μ"
msgid "100 m"
msgstr "100 μ"
-msgid "high"
-msgstr "υψηλό"
-
-msgid "medium"
-msgstr "μεσαίο"
-
msgid "symbol"
msgstr ""
@@ -21553,6 +22930,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 ""
@@ -21571,6 +22951,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=...\" στα στοιχεία;"
@@ -21799,7 +23182,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."
@@ -21849,7 +23235,7 @@ msgstr "Διαγραφή του επιλεγμένου θέματος από τ
msgid "Color Schemes"
msgstr "Θέματα χρωμάτων"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -22077,27 +23463,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 "Εισαγωγή δεδομένων από την συσκευή."
@@ -23191,9 +24559,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 ""
@@ -23840,9 +25225,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Προέκυψε σφάλμα: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23897,18 +25279,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 "Άνοιγμα στον περιηγητή"
@@ -24257,6 +25627,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -24408,6 +25799,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 ""
@@ -24727,9 +26121,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr "Δημιουργία Στάσεων από GPX"
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr "Ίχνη σε αυτό το ερχείο GPX:"
@@ -24946,6 +26337,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 ""
@@ -24978,15 +26372,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 ""
@@ -25101,9 +26511,6 @@ msgstr "Προτιμήσεις πρόσθετου Δρομολόγησης"
msgid "Configure routing preferences."
msgstr "Ρύθμιση προτιμήσεων δρομολόγησης"
-msgid "Highway type"
-msgstr "Τύπος οδικής αρτηρίας"
-
msgid "Speed (Km/h)"
msgstr "Ταχύτητα (ΧΑΩ)"
@@ -25282,19 +26689,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"
@@ -25510,6 +26917,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"
@@ -25546,6 +27042,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..."
@@ -25698,9 +27197,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr "Ακρίβεια"
-
msgid "Select as much as you like:"
msgstr ""
@@ -26732,9 +28228,6 @@ msgstr "Αποεπιλογή κόμβων"
msgid "Removes all nodes from selection"
msgstr "Αφαιρεί όλους τους κόμβους από την επιλογή"
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -27017,9 +28510,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 b1a3a30..10646c0 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-08-04 03:41+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-08-05 05:06+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 "
@@ -256,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"
@@ -295,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}"
@@ -351,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"
@@ -537,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 ""
@@ -651,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"
@@ -803,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"
@@ -994,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 "
@@ -1023,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>"
@@ -1195,9 +1188,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1344,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"
@@ -1450,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"
@@ -1738,6 +1745,9 @@ 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)"
@@ -1961,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] ""
@@ -2398,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 ""
@@ -2598,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 "
@@ -2691,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}"
@@ -2727,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"
@@ -2753,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}''"
@@ -2862,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"
@@ -2922,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"
@@ -2955,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"
@@ -2979,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 ""
@@ -3009,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 "
@@ -3033,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 "
@@ -3046,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 "
@@ -3072,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}"
@@ -3103,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}''"
@@ -3269,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 ""
@@ -3377,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 ""
@@ -3415,9 +3423,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3458,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"
@@ -3482,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 ""
@@ -3543,6 +3560,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Duplicated nodes"
@@ -3625,6 +3645,15 @@ 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"
@@ -3694,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 ""
@@ -3753,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})"
@@ -3793,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}"
@@ -3936,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"
@@ -4011,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}"
@@ -4041,9 +4079,6 @@ msgstr "building"
msgid "area"
msgstr "area"
-msgid "Unclosed way"
-msgstr "Unclosed way"
-
msgid "Unconnected ways"
msgstr ""
@@ -4068,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''"
@@ -4134,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)"
@@ -4256,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"
@@ -4497,6 +4513,18 @@ 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"
@@ -4603,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 ""
@@ -4915,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."
@@ -4922,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."
@@ -4929,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."
@@ -4946,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"
@@ -4962,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"
@@ -5017,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"
@@ -5280,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 "
@@ -5833,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"
@@ -5916,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"
@@ -6007,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 "
@@ -6185,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 ""
@@ -6501,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 ""
@@ -6572,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 "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"
@@ -6614,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)"
@@ -6774,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"
@@ -7105,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"
@@ -7243,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, "
@@ -7267,21 +7330,7 @@ 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."
+msgid "Download referrers (parent relations and ways)"
msgstr ""
msgid "Class Type"
@@ -7388,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."
@@ -7491,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"
@@ -7597,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"
@@ -7616,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:"
@@ -7684,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"
@@ -7768,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 ""
@@ -7787,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 ""
@@ -8023,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 "
@@ -8037,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 ""
@@ -8052,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"
@@ -8059,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 ""
@@ -8197,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..."
@@ -8210,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>"
@@ -8230,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:"
@@ -8381,7 +8455,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8411,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"
@@ -8782,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..."
@@ -8803,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"
@@ -8862,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"
@@ -8934,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 ""
@@ -9134,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 ""
@@ -9157,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"
@@ -9167,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:"
@@ -9423,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}''"
@@ -10190,6 +10261,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -10260,6 +10364,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 ""
@@ -10314,6 +10421,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 ""
@@ -10783,6 +10895,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"
@@ -10848,8 +10966,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"
@@ -11110,21 +11228,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"
@@ -11146,6 +11249,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}''"
@@ -11209,8 +11327,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:"
@@ -11219,22 +11337,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. "
@@ -11323,17 +11445,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 ""
@@ -11405,8 +11519,8 @@ msgstr "Apply Preset"
msgid "New relation"
msgstr ""
-msgid "Change Properties"
-msgstr "Change Properties"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -11469,11 +11583,11 @@ msgstr ""
msgid "Unknown type: {0}"
msgstr "Unknown type: {0}"
-msgid "Preset group {1} / {0}"
-msgstr "Preset group {1} / {0}"
+msgid "Could not read tagging preset source: {0}"
+msgstr "Could not read tagging preset source: {0}"
-msgid "Preset group {0}"
-msgstr "Preset group {0}"
+msgid "Error parsing {0}: "
+msgstr "Error parsing {0}: "
msgid "Roles cannot appear more than once"
msgstr ""
@@ -11484,9 +11598,6 @@ msgstr ""
msgid "Preset sub element without parent"
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}: "
@@ -11505,6 +11616,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 ""
@@ -11539,9 +11660,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 ""
@@ -11577,11 +11744,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."
@@ -11624,39 +11789,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..."
@@ -11754,6 +11907,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}."
@@ -11769,15 +11925,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 ""
@@ -11856,8 +12018,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!"
@@ -11959,61 +12121,28 @@ 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}''."
+"Unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
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}''."
+"Illegal document structure. Found node, way, or relation outside of "
+"''create'', ''modify'', or ''delete''."
msgstr ""
+"Illegal document structure. Found node, way, or relation outside of "
+"''create'', ''modify'', or ''delete''."
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 ""
-"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 "
-"({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 "
-"''create'', ''modify'', or ''delete''."
-msgstr ""
-"Illegal document structure. Found node, way, or relation outside of "
-"''create'', ''modify'', or ''delete''."
-
-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 "Parsing changeset content ..."
-msgstr "Parsing changeset content ..."
+msgid "Parsing changeset content ..."
+msgstr "Parsing changeset content ..."
msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
msgstr "Illegal value for attribute ''{0}''. Got ''{1}''."
@@ -12036,11 +12165,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>"
@@ -12129,11 +12255,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}."
@@ -12336,7 +12460,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 "RemoteControl::Accepting connections on port {0}"
@@ -12382,6 +12512,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."
@@ -12412,19 +12551,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 ""
@@ -12446,11 +12585,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 ""
@@ -12520,18 +12671,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}''"
@@ -12698,11 +12845,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"
@@ -12716,27 +12863,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}''"
@@ -12811,10 +12953,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 ""
@@ -12828,12 +12968,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}''"
@@ -13200,15 +13353,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 "Failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
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 ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
msgid "{0}... [please type its number]"
msgstr ""
@@ -13220,9 +13370,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 ""
@@ -13254,9 +13447,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."
@@ -13591,6 +13798,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 ""
@@ -13852,6 +14064,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."
@@ -13906,9 +14121,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 ""
@@ -13950,6 +14162,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 ""
@@ -14084,6 +14301,9 @@ msgstr "Embankment"
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "Toll"
+
msgid "Motorway Link"
msgstr "Motorway Link"
@@ -14174,6 +14394,50 @@ msgstr "Residential"
msgid "Edit Residential Street"
msgstr "Edit Residential 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"
@@ -14192,11 +14456,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"
@@ -14207,6 +14471,9 @@ msgstr "driveway"
msgid "parking_aisle"
msgstr "parking_aisle"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Parking Aisle"
@@ -14234,18 +14501,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)"
@@ -14255,9 +14516,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr "destination"
-
msgid "delivery"
msgstr "delivery"
@@ -14267,15 +14525,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"
@@ -14321,6 +14579,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)"
@@ -14405,6 +14666,9 @@ msgstr "Edit Bridge"
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -14509,20 +14773,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"
@@ -14539,10 +14812,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"
@@ -14578,7 +14851,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -14647,12 +14920,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"
@@ -14668,15 +14947,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)"
@@ -14698,6 +14968,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"
@@ -14707,6 +14986,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Mini-roundabout"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Direction"
@@ -14716,11 +14998,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"
@@ -14752,9 +15031,6 @@ msgstr "table"
msgid "Passing Place"
msgstr "Passing Place"
-msgid "Edit Passing Place"
-msgstr "Edit Passing Place"
-
msgid "Turning Circle"
msgstr "Turning Circle"
@@ -14797,6 +15073,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr "Allowed traffic:"
+msgid "Material"
+msgstr "Material"
+
+msgid "stone"
+msgstr "stone"
+
msgid "Bollard"
msgstr "Bollard"
@@ -14812,6 +15094,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr "plastic"
+
msgid "Cycle Barrier"
msgstr "Cycle Barrier"
@@ -14881,21 +15166,18 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
-msgstr ""
+msgid "pole"
+msgstr "pole"
-msgid "split_rail"
+msgid "Guard Rail"
msgstr ""
-msgid "chain"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "hedge"
+msgid "wire"
msgstr ""
-msgid "pole"
-msgstr "pole"
-
msgid "Guard Rail"
msgstr ""
@@ -14924,8 +15206,9 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
-msgstr "Edit Ditch"
+msgstr ""
msgid "Kerb"
msgstr ""
@@ -14933,11 +15216,11 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
-msgstr "Entrance"
+msgid "Entrance (barrier opening)"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Edit an Entrance"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Gate"
@@ -14990,16 +15273,25 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "stone"
-
msgid "Turnstile"
msgstr "Turnstile"
-msgid "Edit Turnstile"
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
+msgid "Material"
+msgstr "Material"
+
+msgid "stone"
+msgstr "stone"
+
+msgid "Turnstile"
+msgstr "Turnstile"
+
+msgid "Edit Turnstile"
msgstr "Edit Turnstile"
msgid "Sally Port"
@@ -15056,12 +15348,21 @@ msgstr "Edit Drain"
msgid "Ditch"
msgstr "Ditch"
+msgid "Edit Ditch"
+msgstr "Edit Ditch"
+
msgid "Stream"
msgstr "Stream"
msgid "Edit Stream"
msgstr "Edit Stream"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Canal"
@@ -15101,9 +15402,6 @@ msgstr "Edit Dam"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -15137,6 +15435,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"
@@ -15218,18 +15531,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 ""
@@ -15305,7 +15623,7 @@ msgstr "tourism"
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -15329,11 +15647,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"
@@ -15344,9 +15665,6 @@ msgstr "Narrow Gauge Railway"
msgid "Edit Narrow Gauge Rail"
msgstr "Edit Narrow Gauge Railway"
-msgid "Types"
-msgstr "Types"
-
msgid "Monorail"
msgstr "Monorail"
@@ -15398,6 +15716,9 @@ msgstr ""
msgid "Level Crossing"
msgstr "Level Crossing"
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -15410,18 +15731,32 @@ msgstr ""
msgid "Barrier"
msgstr ""
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
msgid "half"
-msgstr "half"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "full"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "double_half"
msgstr ""
msgid "Crossing"
msgstr "Crossing"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Crossing type"
@@ -15521,11 +15856,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -15537,13 +15870,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"
@@ -15560,12 +15891,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"
@@ -15593,9 +15924,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Capacity"
@@ -15617,10 +15945,29 @@ 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"
@@ -15770,6 +16117,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr "Voltage"
+
msgid "Amperage"
msgstr ""
@@ -15791,6 +16141,12 @@ msgstr "Repair"
msgid "Edit Car Repair"
msgstr "Edit Car Repair"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15818,6 +16174,12 @@ msgstr "Rental"
msgid "Edit Car Rental"
msgstr "Edit Car Rental"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "Sharing"
@@ -15842,22 +16204,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 ""
@@ -15879,9 +16225,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Clothes"
@@ -16076,6 +16419,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -16106,6 +16452,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Bench"
@@ -16118,9 +16467,6 @@ msgstr "Wheelchair"
msgid "limited"
msgstr "limited"
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -16130,8 +16476,13 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
-msgstr ""
+msgstr "Station"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Edit Station"
msgid "Building"
msgstr "Building"
@@ -16145,6 +16496,9 @@ msgstr "Edit Subway Entrance"
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -16169,14 +16523,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"
@@ -16225,8 +16571,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"
@@ -16279,6 +16625,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 ""
@@ -16301,21 +16662,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 ""
@@ -16505,9 +16851,6 @@ msgstr ""
msgid "Edit Stripclub"
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 "Tourism"
msgstr "Tourism"
@@ -16529,9 +16872,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"
@@ -16544,6 +16893,9 @@ msgstr "street"
msgid "scheme"
msgstr "scheme"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Shown Area"
@@ -16583,6 +16935,9 @@ msgstr "... other transportation modes possible"
msgid "Information Board"
msgstr "Information Board"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Board Content"
@@ -16604,23 +16959,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"
@@ -16749,50 +17116,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"
@@ -16809,6 +17170,12 @@ msgstr "catholic"
msgid "evangelical"
msgstr "evangelical"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "jehovahs_witness"
@@ -16821,6 +17188,9 @@ msgstr "methodist"
msgid "mormon"
msgstr "mormon"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "orthodox"
@@ -16839,41 +17209,141 @@ msgstr "quaker"
msgid "roman_catholic"
msgstr ""
-msgid "shia"
-msgstr "shia"
+msgid "russian_orthodox"
+msgstr ""
-msgid "sunni"
-msgstr "sunni"
+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 "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
+msgid "shia"
+msgstr "shia"
+
+msgid "sunni"
+msgstr "sunni"
+
+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 "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"
@@ -16959,6 +17429,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"
@@ -17040,12 +17516,66 @@ msgstr "Veterinary"
msgid "Edit Veterinary"
msgstr "Edit Veterinary"
-msgid "Drinking water"
+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"
@@ -17055,6 +17585,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 ""
@@ -17064,31 +17618,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 ""
@@ -17116,8 +17676,8 @@ msgstr ""
msgid "Recycling"
msgstr "Recycling"
-msgid "Edit Recycling station"
-msgstr "Edit Recycling station"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Batteries"
@@ -17143,21 +17703,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 "plastic"
-msgstr "plastic"
-
msgid "Amount of Seats"
msgstr "Amount of Seats"
@@ -17192,8 +17746,17 @@ msgstr "Edit Hunting Stand"
msgid "Height"
msgstr "Height"
+msgctxt "height"
msgid "low"
-msgstr "low"
+msgstr ""
+
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
msgid "Hide"
msgstr "Hide"
@@ -17201,9 +17764,6 @@ msgstr "Hide"
msgid "Lock"
msgstr "Lock"
-msgid "Drinking Water"
-msgstr "Drinking Water"
-
msgid "Edit Source of Potable Water"
msgstr ""
@@ -17235,6 +17795,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -17272,119 +17835,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"
@@ -17416,26 +18015,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 ""
@@ -17443,6 +18043,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "pitch"
+
+msgid "sports_centre"
+msgstr "sports_centre"
+
+msgid "stadium"
+msgstr "stadium"
+
msgid "10pin"
msgstr "10pin"
@@ -17476,6 +18085,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"
@@ -17532,7 +18157,7 @@ msgid "Skating"
msgstr "Skating"
msgid "Edit Skating"
-msgstr "Edit Skating"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -17576,36 +18201,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 ""
@@ -17648,19 +18291,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 ""
@@ -17799,6 +18438,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 ""
@@ -17811,60 +18462,134 @@ msgstr "Man Made"
msgid "Edit Building"
msgstr ""
-msgid "roof"
+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"
@@ -18089,41 +18814,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"
@@ -18132,8 +18883,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"
@@ -18144,12 +18895,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"
@@ -18201,89 +19042,192 @@ 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 "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 "battery charging"
+msgid "Boiling Water Reactor 4 (BWR-4)"
msgstr ""
-msgid "Power Station"
-msgstr "Power Station"
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Edit Power Station"
+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 "Power Sub Station"
@@ -18294,6 +19238,21 @@ 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 ""
@@ -18309,6 +19268,9 @@ msgstr "Edit Power Tower"
msgid "Tower reference"
msgstr "Tower reference"
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -18327,11 +19289,9 @@ msgstr "Edit Power Line"
msgid "Line type"
msgstr "Line type"
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -18440,11 +19400,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"
@@ -18455,7 +19415,7 @@ msgstr "Edit Butcher"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -18476,6 +19436,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr "Organic"
+
msgid "Greengrocer"
msgstr ""
@@ -18488,9 +19451,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr "Organic"
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -18560,7 +19520,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -18581,13 +19541,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"
@@ -18596,9 +19556,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"
@@ -18624,6 +19583,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 ""
@@ -18654,16 +19619,37 @@ msgstr "Optician"
msgid "Edit Optician"
msgstr "Edit Optician"
-msgid "Jewelry"
-msgstr ""
+msgid "Jewelry"
+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 "Edit Jewelry"
-msgstr ""
+msgid "jewish"
+msgstr "jewish"
+
+msgid "muslim"
+msgstr "muslim"
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -18693,7 +19679,7 @@ msgstr "Edit Hardware Store"
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18705,19 +19691,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"
@@ -18753,7 +19739,7 @@ msgstr "Edit Travel Agency"
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18966,6 +19952,12 @@ msgstr "Peak"
msgid "Edit Peak"
msgstr "Edit Peak"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Glacier"
@@ -19005,26 +19997,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"
@@ -19032,15 +20033,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 ""
@@ -19116,6 +20108,12 @@ msgstr "Meadow"
msgid "Edit Meadow Landuse"
msgstr "Edit Meadow Landuse"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Vineyard"
@@ -19170,8 +20168,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"
@@ -19182,6 +20180,9 @@ msgstr "Graveyard"
msgid "Edit Graveyard"
msgstr "Edit Graveyard"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Cemetery"
@@ -19257,6 +20258,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"
@@ -19293,6 +20321,18 @@ msgstr "even"
msgid "alphabetic"
msgstr "alphabetic"
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -19461,20 +20501,49 @@ msgstr ""
msgid "Edit general route"
msgstr ""
+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 "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"
@@ -19521,19 +20590,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"
+msgid "Edit Associated Street"
+msgstr ""
+
+msgid "house"
msgstr ""
msgid "Street"
@@ -19557,7 +20629,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -19653,18 +20725,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"
@@ -19674,8 +20755,11 @@ msgstr "barrier"
msgid "motorroad"
msgstr "motorroad"
-msgid "highway_track"
-msgstr "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "services"
@@ -19683,11 +20767,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"
@@ -19704,6 +20788,9 @@ msgstr "rapids"
msgid "railwaypoint"
msgstr "railwaypoint"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19719,29 +20806,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"
@@ -19761,20 +20848,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"
@@ -19848,11 +20935,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"
@@ -19866,9 +20956,6 @@ msgstr "Village/City"
msgid "One Way"
msgstr "One Way"
-msgid "Church"
-msgstr "Church"
-
msgid "Fuel Station"
msgstr "Fuel Station"
@@ -19896,6 +20983,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19941,10 +21031,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"
@@ -19956,7 +21076,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"
@@ -19974,7 +21094,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -20091,19 +21211,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 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"
@@ -20122,7 +21353,46 @@ 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 "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 "Landsat"
@@ -20134,19 +21404,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 "skobbler heatmap"
@@ -20167,7 +21446,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -20176,6 +21455,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -20322,6 +21604,29 @@ 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 ""
@@ -20487,6 +21792,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -20532,6 +21840,39 @@ msgstr ""
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 "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 ""
@@ -20737,6 +22078,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 ""
@@ -20758,13 +22111,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -21027,10 +22374,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -21057,6 +22407,9 @@ msgstr ""
msgid "Error while creating image layer: {0}"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -21234,8 +22587,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"
@@ -21506,15 +22859,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 ""
@@ -21698,6 +23042,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 ""
@@ -21716,12 +23063,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr "symbol"
@@ -21866,6 +23207,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:"
@@ -21885,6 +23229,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?"
@@ -22129,8 +23476,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."
@@ -22181,7 +23531,7 @@ msgstr "Delete the selected scheme from the list."
msgid "Color Schemes"
msgstr "Colour Schemes"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -22408,27 +23758,9 @@ 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 "Configure"
-msgstr "Configure"
-
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."
@@ -23518,9 +24850,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"
@@ -24172,9 +25526,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "An error occurred: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr "Process queue"
@@ -24231,18 +25582,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 ""
@@ -24593,6 +25932,27 @@ msgstr "Test failed: Could not read mtime."
msgid "Test failed: Could not write mtime."
msgstr "Test failed: Could not write mtime."
+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 ""
@@ -24744,6 +26104,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 ""
@@ -25061,9 +26424,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -25279,6 +26639,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 ""
@@ -25311,15 +26674,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 ""
@@ -25434,9 +26817,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)"
@@ -25615,19 +26995,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"
@@ -25844,6 +27224,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 ""
@@ -25880,6 +27349,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..."
@@ -26032,9 +27504,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -27020,9 +28489,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr "Video"
-
msgid "Import Video"
msgstr ""
@@ -27313,9 +28779,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 327b7f4..8ea927f 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-08-04 03:41+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-08-05 05:08+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 "
@@ -256,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"
@@ -295,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}"
@@ -351,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"
@@ -535,6 +537,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -648,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 ""
@@ -798,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"
@@ -984,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 ""
@@ -1007,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>"
@@ -1175,9 +1173,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1316,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"
@@ -1411,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 ""
@@ -1695,6 +1711,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1914,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] ""
@@ -2340,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 ""
@@ -2536,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 ""
@@ -2623,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 ""
@@ -2659,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"
@@ -2685,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}''"
@@ -2790,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] ""
@@ -2850,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"
@@ -2881,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"
@@ -2905,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 ""
@@ -2935,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 ""
@@ -2955,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 ""
@@ -2964,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 ""
@@ -2984,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}"
@@ -3015,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}''."
@@ -3172,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 ""
@@ -3280,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 ""
@@ -3318,9 +3344,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3359,6 +3382,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3383,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 ""
@@ -3442,6 +3477,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3524,6 +3562,15 @@ 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 ""
@@ -3593,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 ""
@@ -3650,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})"
@@ -3688,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}"
@@ -3825,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"
@@ -3900,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 ""
@@ -3930,9 +3986,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3957,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''"
@@ -4023,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 ""
@@ -4143,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"
@@ -4372,6 +4408,18 @@ 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 ""
@@ -4476,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 ""
@@ -4776,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"
@@ -4813,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"
@@ -4865,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 ""
@@ -5122,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 ""
@@ -5650,6 +5695,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5733,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 ""
@@ -5823,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 ""
@@ -5994,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 ""
@@ -6281,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"
@@ -6347,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 "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"
@@ -6389,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)"
@@ -6549,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"
@@ -6867,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 ""
@@ -6998,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, "
@@ -7022,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 ""
@@ -7135,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."
@@ -7234,6 +7309,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7321,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"
@@ -7340,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 ""
@@ -7406,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"
@@ -7482,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 ""
@@ -7497,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"
@@ -7713,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 "
@@ -7727,10 +7803,26 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 ""
+
+msgid "Cancel and return to the previous dialog"
msgstr ""
msgid "Do not show this message again"
@@ -7742,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 ""
@@ -7749,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 ..."
@@ -7862,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] ""
@@ -7874,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>"
@@ -7890,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:"
@@ -8036,7 +8143,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8066,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"
@@ -8419,9 +8526,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8440,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 ""
@@ -8497,6 +8604,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8563,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 ""
@@ -8746,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}''..."
@@ -8768,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"
@@ -8778,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:"
@@ -8999,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}''"
@@ -9714,6 +9819,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9782,6 +9920,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9835,6 +9976,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 ""
@@ -10291,6 +10437,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 ""
@@ -10354,7 +10506,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 ""
@@ -10612,40 +10764,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}''"
@@ -10698,8 +10850,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:"
@@ -10708,20 +10860,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 ""
@@ -10803,14 +10960,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"
@@ -10883,7 +11034,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10962,9 +11113,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10983,6 +11131,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 ""
@@ -11012,9 +11168,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 ""
@@ -11045,7 +11241,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 ""
@@ -11085,28 +11281,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..."
@@ -11201,6 +11395,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11216,12 +11413,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}."
@@ -11300,7 +11505,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11399,35 +11604,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 ""
@@ -11437,8 +11618,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 ..."
@@ -11465,10 +11646,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>"
@@ -11552,8 +11730,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}."
@@ -11750,7 +11928,7 @@ 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}"
@@ -11796,6 +11974,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."
@@ -11826,19 +12013,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 ""
@@ -11860,11 +12047,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 ""
@@ -11934,13 +12133,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}''"
@@ -12083,10 +12282,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"
@@ -12101,22 +12300,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}''"
@@ -12185,8 +12383,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..."
@@ -12201,9 +12398,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}''"
@@ -12525,12 +12737,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12541,27 +12752,70 @@ 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 "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] ""
+
+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"
@@ -12575,9 +12829,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."
@@ -12900,6 +13168,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 ""
@@ -13139,6 +13412,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."
@@ -13188,9 +13464,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 ""
@@ -13227,6 +13500,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 ""
@@ -13357,6 +13635,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13447,6 +13728,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 ""
@@ -13465,10 +13790,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13480,6 +13805,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13507,18 +13835,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 ""
@@ -13528,9 +13850,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13540,13 +13859,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13594,6 +13913,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13678,6 +14000,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13782,21 +14107,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 ""
@@ -13812,10 +14146,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"
@@ -13851,7 +14185,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13920,12 +14254,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 ""
@@ -13941,15 +14281,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 ""
@@ -13971,6 +14302,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13980,6 +14320,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13989,10 +14332,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14025,9 +14365,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14070,6 +14407,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14085,6 +14428,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14154,19 +14500,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14197,6 +14537,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14206,10 +14547,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14263,12 +14604,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14329,12 +14664,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14374,9 +14718,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14410,6 +14751,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 ""
@@ -14491,18 +14847,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 ""
@@ -14578,7 +14939,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14602,10 +14963,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"
@@ -14617,9 +14981,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14671,6 +15032,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14683,6 +15047,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14794,11 +15193,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14810,11 +15207,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14833,10 +15228,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14866,9 +15261,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14890,10 +15282,29 @@ 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"
@@ -15043,6 +15454,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15064,7 +15478,13 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
-msgid "Tyres"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
+msgid "Tyres"
msgstr ""
msgid "Edit Tyres"
@@ -15091,6 +15511,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15115,22 +15541,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 ""
@@ -15152,9 +15562,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15349,6 +15756,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15379,6 +15789,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15391,9 +15804,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15403,9 +15813,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15418,6 +15833,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15442,14 +15860,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15498,7 +15908,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15552,41 +15962,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"
@@ -15778,9 +16188,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15802,9 +16209,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15817,6 +16230,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15856,6 +16272,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15877,22 +16296,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"
@@ -16022,49 +16453,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"
@@ -16082,6 +16507,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16094,6 +16525,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16112,37 +16546,137 @@ 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"
@@ -16232,6 +16766,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 ""
@@ -16313,125 +16853,203 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
msgstr ""
msgid "Edit Shelter"
@@ -16465,16 +17083,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16508,6 +17132,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16545,117 +17172,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 ""
@@ -16689,33 +17352,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 ""
@@ -16749,6 +17422,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 ""
@@ -16849,36 +17538,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 ""
@@ -16921,19 +17628,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 ""
@@ -17072,6 +17775,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 ""
@@ -17084,60 +17799,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 ""
@@ -17362,41 +18151,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"
@@ -17405,7 +18220,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17417,12 +18232,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 ""
@@ -17474,88 +18379,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17567,6 +18575,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 ""
@@ -17582,6 +18605,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17600,11 +18626,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17713,10 +18737,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17728,7 +18752,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17749,6 +18773,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17761,9 +18788,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17833,7 +18857,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17854,13 +18878,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"
@@ -17869,7 +18893,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17897,6 +18920,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17933,10 +18962,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"
@@ -17966,7 +19016,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17978,19 +19028,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"
@@ -18026,7 +19076,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18239,6 +19289,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18278,24 +19334,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 ""
@@ -18305,15 +19370,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18389,6 +19445,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18443,7 +19505,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18455,6 +19517,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18491,43 +19556,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18566,6 +19658,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18734,21 +19838,50 @@ 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 ""
+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 ""
@@ -18794,19 +19927,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"
@@ -18830,7 +19966,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18926,18 +20062,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 ""
@@ -18947,7 +20092,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18956,10 +20104,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18977,6 +20125,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18992,28 +20143,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"
@@ -19034,19 +20185,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"
@@ -19121,10 +20272,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19139,9 +20293,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19169,6 +20320,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19214,10 +20368,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"
@@ -19229,7 +20413,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"
@@ -19247,7 +20431,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19364,19 +20548,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 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"
@@ -19395,7 +20690,46 @@ 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 "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 "Landsat"
@@ -19407,19 +20741,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 "skobbler heatmap"
@@ -19440,7 +20783,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19449,6 +20792,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19595,6 +20941,29 @@ 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 ""
@@ -19760,6 +21129,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19805,6 +21177,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19991,19 +21396,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20027,13 +21444,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20296,10 +21707,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20503,7 +21917,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"
@@ -20774,15 +22188,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20953,6 +22358,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 ""
@@ -20971,12 +22379,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21112,6 +22514,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 ""
@@ -21129,6 +22534,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 ""
@@ -21355,7 +22763,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."
@@ -21405,7 +22816,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21590,6 +23001,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21629,27 +23105,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 ""
@@ -22727,9 +24185,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 ""
@@ -23376,9 +24851,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23431,18 +24903,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 ""
@@ -23789,6 +25249,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23940,6 +25421,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 ""
@@ -24257,9 +25741,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24475,6 +25956,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 ""
@@ -24507,15 +25991,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 ""
@@ -24630,9 +26130,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24811,19 +26308,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"
@@ -25039,6 +26536,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 ""
@@ -25075,6 +26661,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..."
@@ -25227,9 +26816,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26215,9 +27801,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26496,9 +28079,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 2ca7d38..d581b07 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-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-06-02 11:45+0000\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-08-05 05:06+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ 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}"
@@ -59,6 +62,9 @@ msgstr "INFO: {0}"
msgid "DEBUG: {0}"
msgstr "DEBUG: {0}"
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Executing platform startup hook"
@@ -162,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 "
@@ -220,7 +226,10 @@ msgid "Add imagery layer {0}"
msgstr "Add imagery layer {0}"
msgid "Select image format for WMS layer"
-msgstr ""
+msgstr "Select image format for WMS layer"
+
+msgid "Select WMS layers"
+msgstr "Select WMS layers"
msgid "Select WMS layers"
msgstr "Select WMS layers"
@@ -261,9 +270,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"
@@ -300,6 +306,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}"
@@ -356,10 +365,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"
@@ -430,7 +439,7 @@ 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 ""
+msgstr "Ignoring {0} nodes with null coordinates"
msgid "Download from OSM..."
msgstr "Download from OSM..."
@@ -544,6 +553,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)"
@@ -622,7 +634,7 @@ 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 ""
@@ -650,16 +662,16 @@ msgid "Reverting changes"
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"
@@ -668,33 +680,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"
@@ -820,8 +837,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"
@@ -1011,16 +1028,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 "
@@ -1040,9 +1050,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>"
@@ -1212,9 +1219,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1361,18 +1365,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"
@@ -1467,6 +1467,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"
@@ -1755,6 +1776,9 @@ 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)"
@@ -1978,8 +2002,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] ""
@@ -2415,6 +2439,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2615,10 +2642,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 "
@@ -2708,6 +2733,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}"
@@ -2744,10 +2772,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"
@@ -2770,8 +2798,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}''"
@@ -2879,6 +2907,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"
@@ -2939,11 +2970,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"
@@ -2972,11 +3001,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"
@@ -2996,6 +3025,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 ""
@@ -3026,21 +3058,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 "
@@ -3050,11 +3080,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 "
@@ -3063,16 +3091,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 "
@@ -3089,8 +3113,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}"
@@ -3120,12 +3144,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}''"
@@ -3286,8 +3309,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 ""
@@ -3394,7 +3416,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3432,9 +3454,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3475,6 +3494,9 @@ msgstr "validation other"
msgid "Running test {0}"
msgstr "Running test {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Addresses"
@@ -3499,6 +3521,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 ""
@@ -3560,6 +3591,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Duplicated nodes"
@@ -3642,6 +3676,15 @@ 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"
@@ -3711,6 +3754,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 ""
@@ -3770,13 +3819,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})"
@@ -3810,11 +3859,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}"
@@ -3953,8 +4002,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"
@@ -4028,6 +4077,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}"
@@ -4058,9 +4110,6 @@ msgstr "building"
msgid "area"
msgstr "area"
-msgid "Unclosed way"
-msgstr "Unclosed way"
-
msgid "Unconnected ways"
msgstr ""
@@ -4085,10 +4134,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''"
@@ -4151,25 +4200,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)"
@@ -4273,7 +4303,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"
@@ -4514,6 +4544,18 @@ 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"
@@ -4620,20 +4662,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 ""
@@ -4932,6 +4960,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."
@@ -4939,6 +4970,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."
@@ -4946,16 +4980,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."
@@ -4963,6 +5006,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"
@@ -4979,8 +5025,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"
@@ -5034,16 +5080,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"
@@ -5297,16 +5333,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 "
@@ -5850,6 +5885,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"
@@ -5933,6 +5971,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"
@@ -6024,10 +6092,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 "
@@ -6202,9 +6268,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 ""
@@ -6526,11 +6589,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 ""
@@ -6597,35 +6658,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"
@@ -6639,13 +6712,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)"
@@ -6799,7 +6872,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"
@@ -7132,6 +7205,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"
@@ -7270,21 +7363,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, "
@@ -7296,28 +7376,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"
@@ -7422,8 +7483,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."
@@ -7525,6 +7586,9 @@ msgid ""
msgstr ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr "Changeset info"
@@ -7631,8 +7695,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"
@@ -7650,6 +7714,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:"
@@ -7718,11 +7788,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"
@@ -7802,8 +7869,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 ""
@@ -7821,11 +7888,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 ""
@@ -8057,12 +8121,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 "
@@ -8071,6 +8129,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 ""
@@ -8086,6 +8160,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"
@@ -8093,11 +8182,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 ""
@@ -8231,9 +8318,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..."
@@ -8244,6 +8328,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>"
@@ -8264,9 +8351,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:"
@@ -8415,7 +8501,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8445,8 +8531,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"
@@ -8816,9 +8902,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..."
@@ -8837,6 +8920,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"
@@ -8896,6 +8982,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"
@@ -8968,9 +9060,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 ""
@@ -9168,16 +9257,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 ""
@@ -9191,7 +9275,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"
@@ -9201,8 +9285,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:"
@@ -9459,8 +9542,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}''"
@@ -10226,6 +10309,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -10296,6 +10412,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 ""
@@ -10350,6 +10469,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 ""
@@ -10819,6 +10943,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"
@@ -10884,8 +11014,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"
@@ -11146,21 +11276,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"
@@ -11182,6 +11297,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}''"
@@ -11245,8 +11375,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:"
@@ -11255,22 +11385,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. "
@@ -11359,17 +11493,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 ""
@@ -11441,8 +11567,8 @@ msgstr "Apply Preset"
msgid "New relation"
msgstr ""
-msgid "Change Properties"
-msgstr "Change Properties"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -11505,11 +11631,11 @@ msgstr ""
msgid "Unknown type: {0}"
msgstr "Unknown type: {0}"
-msgid "Preset group {1} / {0}"
-msgstr "Preset group {1} / {0}"
+msgid "Could not read tagging preset source: {0}"
+msgstr "Could not read tagging preset source: {0}"
-msgid "Preset group {0}"
-msgstr "Preset group {0}"
+msgid "Error parsing {0}: "
+msgstr "Error parsing {0}: "
msgid "Roles cannot appear more than once"
msgstr ""
@@ -11520,9 +11646,6 @@ msgstr ""
msgid "Preset sub element without parent"
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}: "
@@ -11541,6 +11664,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 ""
@@ -11575,9 +11708,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 ""
@@ -11613,11 +11792,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."
@@ -11660,39 +11837,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..."
@@ -11790,6 +11955,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}."
@@ -11805,15 +11973,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 ""
@@ -11892,8 +12066,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!"
@@ -11995,58 +12169,25 @@ 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}''."
+"Unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
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 "
-"({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 "
-"''create'', ''modify'', or ''delete''."
+"Illegal document structure. Found node, way, or relation outside of "
+"''create'', ''modify'', or ''delete''."
msgstr ""
"Illegal document structure. Found node, way, or relation outside of "
"''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 ..."
@@ -12072,11 +12213,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>"
@@ -12165,11 +12303,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}."
@@ -12372,7 +12508,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 "RemoteControl::Accepting connections on port {0}"
@@ -12418,6 +12560,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."
@@ -12448,19 +12599,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 ""
@@ -12482,11 +12633,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 ""
@@ -12556,18 +12719,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}''"
@@ -12734,11 +12893,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"
@@ -12752,27 +12911,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}''"
@@ -12847,10 +13001,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 ""
@@ -12864,12 +13016,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}''"
@@ -13244,15 +13409,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 "Failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
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 ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
msgid "{0}... [please type its number]"
msgstr ""
@@ -13264,9 +13426,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 ""
@@ -13298,9 +13503,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."
@@ -13635,6 +13854,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 ""
@@ -13896,6 +14120,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."
@@ -13948,9 +14175,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 ""
@@ -13992,6 +14216,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 ""
@@ -14128,6 +14357,9 @@ msgstr "Embankment"
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "Toll"
+
msgid "Motorway Link"
msgstr "Motorway Link"
@@ -14218,6 +14450,50 @@ msgstr "Residential"
msgid "Edit Residential Street"
msgstr "Edit Residential 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"
@@ -14236,11 +14512,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"
@@ -14251,6 +14527,9 @@ msgstr "driveway"
msgid "parking_aisle"
msgstr "parking_aisle"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Parking Aisle"
@@ -14278,18 +14557,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)"
@@ -14299,9 +14572,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr "destination"
-
msgid "delivery"
msgstr "delivery"
@@ -14311,15 +14581,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"
@@ -14365,6 +14635,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)"
@@ -14449,6 +14722,9 @@ msgstr "Edit Bridge"
msgid "viaduct"
msgstr "viaduct"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -14553,20 +14829,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"
@@ -14583,10 +14868,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"
@@ -14622,7 +14907,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -14691,12 +14976,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"
@@ -14712,15 +15003,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)"
@@ -14742,6 +15024,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"
@@ -14751,6 +15042,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Mini-roundabout"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Direction"
@@ -14760,11 +15054,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"
@@ -14796,9 +15087,6 @@ msgstr "table"
msgid "Passing Place"
msgstr "Passing Place"
-msgid "Edit Passing Place"
-msgstr "Edit Passing Place"
-
msgid "Turning Circle"
msgstr "Turning Circle"
@@ -14841,6 +15129,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr "Allowed traffic:"
+msgid "Material"
+msgstr "Material"
+
+msgid "stone"
+msgstr "stone"
+
msgid "Bollard"
msgstr "Bollard"
@@ -14856,6 +15150,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr "plastic"
+
msgid "Cycle Barrier"
msgstr "Cycle Barrier"
@@ -14925,21 +15222,18 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
-msgstr ""
+msgid "pole"
+msgstr "pole"
-msgid "split_rail"
+msgid "Guard Rail"
msgstr ""
-msgid "chain"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "hedge"
+msgid "wire"
msgstr ""
-msgid "pole"
-msgstr "pole"
-
msgid "Guard Rail"
msgstr ""
@@ -14968,8 +15262,9 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
-msgstr "Edit Ditch"
+msgstr ""
msgid "Kerb"
msgstr ""
@@ -14977,11 +15272,11 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
-msgstr "Entrance"
+msgid "Entrance (barrier opening)"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Edit an Entrance"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Gate"
@@ -15034,12 +15329,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "stone"
-
msgid "Turnstile"
msgstr "Turnstile"
@@ -15100,12 +15389,21 @@ msgstr "Edit Drain"
msgid "Ditch"
msgstr "Ditch"
+msgid "Edit Ditch"
+msgstr "Edit Ditch"
+
msgid "Stream"
msgstr "Stream"
msgid "Edit Stream"
msgstr "Edit Stream"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Canal"
@@ -15145,9 +15443,6 @@ msgstr "Edit Dam"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -15181,6 +15476,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"
@@ -15262,18 +15572,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 ""
@@ -15349,7 +15664,7 @@ msgstr "tourism"
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -15373,11 +15688,14 @@ msgstr "contact_line"
msgid "rail"
msgstr "rail"
-msgid "Voltage"
-msgstr "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
-msgid "Frequency (Hz)"
-msgstr "Frequency (Hz)"
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
+
+msgid "16.67"
+msgstr ""
msgid "16.7"
msgstr "16.7"
@@ -15388,9 +15706,6 @@ msgstr "Narrow Gauge Railway"
msgid "Edit Narrow Gauge Rail"
msgstr "Edit Narrow Gauge Railway"
-msgid "Types"
-msgstr "Types"
-
msgid "Monorail"
msgstr "Monorail"
@@ -15442,6 +15757,9 @@ msgstr ""
msgid "Level Crossing"
msgstr "Level Crossing"
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -15454,18 +15772,32 @@ msgstr ""
msgid "Barrier"
msgstr ""
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
msgid "half"
-msgstr "half"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "full"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "double_half"
msgstr ""
msgid "Crossing"
msgstr "Crossing"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Crossing type"
@@ -15565,11 +15897,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -15581,13 +15911,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"
@@ -15604,12 +15932,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"
@@ -15637,9 +15965,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Capacity"
@@ -15661,10 +15986,29 @@ 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 "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"
@@ -15814,6 +16158,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr "Voltage"
+
msgid "Amperage"
msgstr ""
@@ -15835,6 +16182,12 @@ msgstr "Repair"
msgid "Edit Car Repair"
msgstr "Edit Car Repair"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15862,6 +16215,12 @@ msgstr "Rental"
msgid "Edit Car Rental"
msgstr "Edit Car Rental"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "Sharing"
@@ -15886,22 +16245,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 ""
@@ -15923,9 +16266,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Clothes"
@@ -16120,6 +16460,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -16150,6 +16493,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Bench"
@@ -16162,9 +16508,6 @@ msgstr "Wheelchair"
msgid "limited"
msgstr "limited"
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -16174,8 +16517,13 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
-msgstr ""
+msgstr "Station"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Edit Station"
msgid "Building"
msgstr "Building"
@@ -16189,6 +16537,9 @@ msgstr "Edit Subway Entrance"
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -16213,14 +16564,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"
@@ -16269,8 +16612,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"
@@ -16323,6 +16666,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 ""
@@ -16345,21 +16703,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 ""
@@ -16549,9 +16892,6 @@ msgstr ""
msgid "Edit Stripclub"
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 "Tourism"
msgstr "Tourism"
@@ -16573,9 +16913,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"
@@ -16588,6 +16934,9 @@ msgstr "street"
msgid "scheme"
msgstr "scheme"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Shown Area"
@@ -16627,6 +16976,9 @@ msgstr "... other transportation modes possible"
msgid "Information Board"
msgstr "Information Board"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Board Content"
@@ -16648,23 +17000,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"
@@ -16793,50 +17157,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"
@@ -16853,6 +17211,12 @@ msgstr "catholic"
msgid "evangelical"
msgstr "evangelical"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "jehovahs_witness"
@@ -16865,6 +17229,9 @@ msgstr "methodist"
msgid "mormon"
msgstr "mormon"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "orthodox"
@@ -16883,50 +17250,150 @@ msgstr "quaker"
msgid "roman_catholic"
msgstr ""
-msgid "shia"
-msgstr "shia"
+msgid "russian_orthodox"
+msgstr ""
-msgid "sunni"
-msgstr "sunni"
+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 "sunni"
+msgstr "sunni"
+
+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 "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 ""
@@ -17003,6 +17470,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"
@@ -17084,12 +17557,66 @@ msgstr "Veterinary"
msgid "Edit Veterinary"
msgstr "Edit Veterinary"
-msgid "Drinking water"
+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"
@@ -17099,6 +17626,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 ""
@@ -17108,31 +17659,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 ""
@@ -17160,8 +17717,8 @@ msgstr ""
msgid "Recycling"
msgstr "Recycling"
-msgid "Edit Recycling station"
-msgstr "Edit Recycling station"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Batteries"
@@ -17187,21 +17744,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 "plastic"
-msgstr "plastic"
-
msgid "Amount of Seats"
msgstr "Amount of Seats"
@@ -17236,8 +17787,17 @@ msgstr "Edit Hunting Stand"
msgid "Height"
msgstr "Height"
+msgctxt "height"
msgid "low"
-msgstr "low"
+msgstr ""
+
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
msgid "Hide"
msgstr "Hide"
@@ -17245,9 +17805,6 @@ msgstr "Hide"
msgid "Lock"
msgstr "Lock"
-msgid "Drinking Water"
-msgstr "Drinking Water"
-
msgid "Edit Source of Potable Water"
msgstr ""
@@ -17279,6 +17836,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -17316,119 +17876,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"
@@ -17460,26 +18056,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 ""
@@ -17487,6 +18084,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "pitch"
+
+msgid "sports_centre"
+msgstr "sports_centre"
+
+msgid "stadium"
+msgstr "stadium"
+
msgid "10pin"
msgstr "10pin"
@@ -17520,6 +18126,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"
@@ -17576,7 +18198,7 @@ msgid "Skating"
msgstr "Skating"
msgid "Edit Skating"
-msgstr "Edit Skating"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -17620,36 +18242,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 ""
@@ -17692,19 +18332,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 ""
@@ -17843,72 +18479,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"
-msgstr "Man Made"
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
+msgid "RC Car"
+msgstr ""
+
+msgid "Edit RC Car"
+msgstr ""
+
+msgid "Man Made"
+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"
@@ -18133,41 +18855,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"
@@ -18176,8 +18924,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"
@@ -18188,12 +18936,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"
@@ -18245,89 +19083,192 @@ 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 "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 "battery charging"
+msgid "China Pressurized Reactor (CPR-1000)"
msgstr ""
-msgid "Power Station"
-msgstr "Power Station"
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Edit Power Station"
+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"
@@ -18338,6 +19279,21 @@ 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 ""
@@ -18353,6 +19309,9 @@ msgstr "Edit Power Tower"
msgid "Tower reference"
msgstr "Tower reference"
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -18371,11 +19330,9 @@ msgstr "Edit Power Line"
msgid "Line type"
msgstr "Line type"
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -18484,11 +19441,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"
@@ -18499,7 +19456,7 @@ msgstr "Edit Butcher"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -18520,6 +19477,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr "Organic"
+
msgid "Greengrocer"
msgstr ""
@@ -18532,9 +19492,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr "Organic"
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -18604,7 +19561,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -18625,13 +19582,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"
@@ -18640,9 +19597,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"
@@ -18668,6 +19624,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 ""
@@ -18698,16 +19660,37 @@ msgstr "Optician"
msgid "Edit Optician"
msgstr "Edit Optician"
-msgid "Jewelry"
-msgstr ""
+msgid "Jewelry"
+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 "Edit Jewelry"
-msgstr ""
+msgid "muslim"
+msgstr "muslim"
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -18737,7 +19720,7 @@ msgstr "Edit Hardware Store"
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18749,19 +19732,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"
@@ -18797,7 +19780,7 @@ msgstr "Edit Travel Agency"
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -19010,6 +19993,12 @@ msgstr "Peak"
msgid "Edit Peak"
msgstr "Edit Peak"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Glacier"
@@ -19049,26 +20038,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"
@@ -19076,15 +20074,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 ""
@@ -19160,6 +20149,12 @@ msgstr "Meadow"
msgid "Edit Meadow Landuse"
msgstr "Edit Meadow Landuse"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Vineyard"
@@ -19214,8 +20209,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"
@@ -19226,6 +20221,9 @@ msgstr "Graveyard"
msgid "Edit Graveyard"
msgstr "Edit Graveyard"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Cemetery"
@@ -19301,6 +20299,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"
@@ -19337,6 +20362,18 @@ msgstr "even"
msgid "alphabetic"
msgstr "alphabetic"
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -19505,20 +20542,49 @@ msgstr ""
msgid "Edit general route"
msgstr ""
+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"
@@ -19565,19 +20631,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"
+msgid "Edit Associated Street"
+msgstr ""
+
+msgid "house"
msgstr ""
msgid "Street"
@@ -19601,7 +20670,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -19697,18 +20766,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"
@@ -19718,8 +20796,11 @@ msgstr "barrier"
msgid "motorroad"
msgstr "motorroad"
-msgid "highway_track"
-msgstr "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "services"
@@ -19727,11 +20808,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"
@@ -19748,6 +20829,9 @@ msgstr "rapids"
msgid "railwaypoint"
msgstr "railwaypoint"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19763,29 +20847,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"
@@ -19805,20 +20889,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"
@@ -19892,11 +20976,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"
@@ -19910,9 +20997,6 @@ msgstr "Village/City"
msgid "One Way"
msgstr "One Way"
-msgid "Church"
-msgstr "Church"
-
msgid "Fuel Station"
msgstr "Fuel Station"
@@ -19940,6 +21024,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19985,10 +21072,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"
@@ -20000,7 +21117,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"
@@ -20018,7 +21135,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -20135,19 +21252,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 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"
@@ -20166,7 +21394,46 @@ 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 "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 "Landsat"
@@ -20175,7 +21442,10 @@ msgstr ""
msgid "Yahoo Sat"
msgstr ""
-msgid "Bing Sat"
+msgid "Bing Sat"
+msgstr ""
+
+msgid "HDDM (Humanitarian OpenStreetMap)"
msgstr ""
msgid "MapBox Satellite"
@@ -20184,13 +21454,19 @@ 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 "skobbler heatmap"
@@ -20211,7 +21487,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -20220,6 +21496,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -20366,6 +21645,29 @@ 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 ""
@@ -20531,6 +21833,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -20576,6 +21881,39 @@ msgstr ""
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 "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 ""
@@ -20781,6 +22119,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 ""
@@ -20802,14 +22152,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 ""
@@ -21071,10 +22415,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -21101,6 +22448,9 @@ msgstr ""
msgid "Error while creating image layer: {0}"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -21278,8 +22628,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"
@@ -21613,15 +22963,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 ""
@@ -21805,6 +23146,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 ""
@@ -21823,12 +23167,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr "symbol"
@@ -21975,6 +23313,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:"
@@ -21994,6 +23335,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?"
@@ -22238,8 +23582,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."
@@ -22290,7 +23637,7 @@ msgstr "Delete the selected scheme from the list."
msgid "Color Schemes"
msgstr "Colour Schemes"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -22517,27 +23864,9 @@ 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 "Configure"
-msgstr "Configure"
-
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."
@@ -23627,9 +24956,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"
@@ -24281,9 +25632,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "An error occurred: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr "Process queue"
@@ -24340,18 +25688,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 ""
@@ -24702,6 +26038,27 @@ msgstr "Test failed: Could not read mtime."
msgid "Test failed: Could not write mtime."
msgstr "Test failed: Could not write mtime."
+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 ""
@@ -24853,6 +26210,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 ""
@@ -25170,9 +26530,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr "Tracks"
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -25388,6 +26745,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 ""
@@ -25420,15 +26780,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 ""
@@ -25543,9 +26923,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)"
@@ -25724,19 +27101,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"
@@ -25953,6 +27330,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 ""
@@ -25989,6 +27455,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..."
@@ -26141,9 +27610,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -27139,9 +28605,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr "Video"
-
msgid "Import Video"
msgstr ""
@@ -27432,9 +28895,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 11b19d1..cb313c1 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-08-04 03:41+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-08-05 04:40+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 ""
@@ -250,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."
@@ -289,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr "Informo"
+
msgid "Zoom to {0}"
msgstr "Zomi al {0}"
@@ -345,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."
@@ -527,6 +531,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -640,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 ""
@@ -790,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"
@@ -976,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 ""
@@ -999,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>"
@@ -1167,9 +1167,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1308,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"
@@ -1403,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 ""
@@ -1687,6 +1705,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1906,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] ""
@@ -2332,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 ""
@@ -2528,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 ""
@@ -2615,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 ""
@@ -2651,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"
@@ -2677,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}''"
@@ -2782,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] ""
@@ -2842,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"
@@ -2873,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"
@@ -2897,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 ""
@@ -2927,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 ""
@@ -2947,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 ""
@@ -2956,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 ""
@@ -2976,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}"
@@ -3007,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}''."
@@ -3164,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 ""
@@ -3272,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 ""
@@ -3310,9 +3338,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3351,6 +3376,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3375,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 ""
@@ -3434,6 +3471,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3516,6 +3556,15 @@ 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 ""
@@ -3585,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 ""
@@ -3642,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})"
@@ -3680,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}"
@@ -3817,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"
@@ -3892,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 ""
@@ -3922,9 +3980,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3949,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''"
@@ -4015,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 ""
@@ -4135,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"
@@ -4364,6 +4402,18 @@ 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 ""
@@ -4468,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 ""
@@ -4768,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 "> 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"
@@ -4805,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"
@@ -4857,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 ""
@@ -5114,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 ""
@@ -5642,6 +5689,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5725,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 ""
@@ -5815,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 ""
@@ -5986,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 ""
@@ -6273,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"
@@ -6339,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"
@@ -6381,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)"
@@ -6541,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"
@@ -6859,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 ""
@@ -6990,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 ""
@@ -7014,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 ""
@@ -7127,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."
@@ -7226,6 +7303,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7313,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"
@@ -7332,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 ""
@@ -7398,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"
@@ -7474,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 ""
@@ -7489,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"
@@ -7705,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 "
@@ -7719,13 +7797,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7734,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 ""
@@ -7741,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 ..."
@@ -7854,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] ""
@@ -7866,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>"
@@ -7882,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:"
@@ -8028,7 +8137,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8058,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"
@@ -8411,9 +8520,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8432,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 ""
@@ -8489,6 +8598,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8555,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 ""
@@ -8738,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}''..."
@@ -8760,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"
@@ -8770,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:"
@@ -8991,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}''"
@@ -9706,6 +9813,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9774,6 +9914,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9827,6 +9970,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 ""
@@ -10283,6 +10431,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 ""
@@ -10346,7 +10500,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 ""
@@ -10604,21 +10758,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 ""
@@ -10640,6 +10779,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 ""
@@ -10690,8 +10844,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:"
@@ -10700,20 +10854,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 ""
@@ -10795,14 +10954,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"
@@ -10875,7 +11028,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10954,9 +11107,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10975,6 +11125,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 ""
@@ -11004,9 +11162,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 ""
@@ -11037,7 +11235,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 ""
@@ -11077,28 +11275,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..."
@@ -11197,6 +11393,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11212,12 +11411,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}."
@@ -11296,7 +11503,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11395,35 +11602,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 ""
@@ -11433,8 +11616,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 ..."
@@ -11461,10 +11644,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>"
@@ -11548,8 +11728,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}."
@@ -11746,7 +11926,7 @@ 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}"
@@ -11792,6 +11972,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."
@@ -11822,19 +12011,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 ""
@@ -11856,11 +12045,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 ""
@@ -11930,13 +12131,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}''"
@@ -12079,10 +12280,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"
@@ -12097,22 +12298,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}''"
@@ -12181,8 +12381,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..."
@@ -12197,9 +12396,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}''"
@@ -12521,12 +12735,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12537,16 +12750,59 @@ 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 "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 ""
+
+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 ""
@@ -12571,9 +12827,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."
@@ -12896,6 +13166,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 ""
@@ -13135,6 +13410,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."
@@ -13184,9 +13462,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 ""
@@ -13223,6 +13498,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 ""
@@ -13353,6 +13633,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13443,6 +13726,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 ""
@@ -13461,10 +13788,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13476,6 +13803,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13503,18 +13833,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 ""
@@ -13524,9 +13848,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13536,15 +13857,15 @@ msgstr ""
msgid "private"
msgstr ""
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr ""
msgid "forestry"
msgstr ""
-msgid "no"
-msgstr "ne"
-
msgid "official"
msgstr ""
@@ -13590,6 +13911,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13674,6 +13998,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13778,21 +14105,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 ""
@@ -13808,10 +14144,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"
@@ -13847,7 +14183,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13916,12 +14252,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 ""
@@ -13937,15 +14279,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 ""
@@ -13967,6 +14300,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13976,6 +14318,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13985,10 +14330,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14021,9 +14363,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14066,6 +14405,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14081,6 +14426,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14150,19 +14498,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14193,6 +14535,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14202,11 +14545,11 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
-msgstr "Enirejo"
+msgid "Entrance (barrier opening)"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Modifi Enirejo"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr ""
@@ -14259,12 +14602,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14325,12 +14662,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14370,9 +14716,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14406,6 +14749,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 ""
@@ -14487,18 +14845,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 ""
@@ -14574,7 +14937,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14598,10 +14961,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"
@@ -14613,9 +14979,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14667,6 +15030,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14679,6 +15045,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14790,11 +15191,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14806,11 +15205,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14829,10 +15226,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14862,9 +15259,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14886,32 +15280,51 @@ 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 "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 "Fuel"
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
msgstr ""
-msgid "Edit Fuel"
+msgid "sunrise-sunset"
msgstr ""
-msgid "Brand"
+msgid "Su 10:00+"
msgstr ""
-msgid "Agip"
-msgstr "Agip"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr ""
-msgid "Aral"
-msgstr "Aral"
+msgid "Parking entrance"
+msgstr ""
+
+msgid "Edit Parking entrance"
+msgstr ""
+
+msgid "Fuel"
+msgstr ""
+
+msgid "Edit Fuel"
+msgstr ""
+
+msgid "Brand"
+msgstr ""
+
+msgid "Agip"
+msgstr "Agip"
+
+msgid "Aral"
+msgstr "Aral"
msgid "Avia"
msgstr "Avia"
@@ -15039,6 +15452,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15060,6 +15476,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15087,6 +15509,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15111,22 +15539,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 ""
@@ -15148,9 +15560,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Vestoj"
@@ -15345,6 +15754,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15375,6 +15787,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15387,9 +15802,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15399,9 +15811,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15414,6 +15831,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15438,14 +15858,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15494,7 +15906,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15548,41 +15960,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"
@@ -15774,9 +16186,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15798,9 +16207,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15813,6 +16228,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15852,6 +16270,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15873,22 +16294,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"
@@ -16018,49 +16451,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 "hindu"
-msgstr "hindua"
-
-msgid "jain"
-msgstr ""
+msgid "Church"
+msgstr "Preĝejo"
-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"
@@ -16078,6 +16505,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16090,6 +16523,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16108,37 +16544,137 @@ 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"
@@ -16228,6 +16764,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 ""
@@ -16309,74 +16851,158 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
-msgstr "Telefono"
-
-msgid "Edit Telephone"
+msgid "public"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "Visibility/readability"
+msgid "Edit Postbox"
msgstr ""
-msgid "house (up to 5m)"
+msgid "Collection times"
msgstr ""
-msgid "street (up to 20m)"
+msgid "11:30"
msgstr ""
-msgid "area (more than 20m)"
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
msgstr ""
-msgid "Shows current date"
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
msgstr ""
-msgid "Shows temperature"
+msgid "Drive through"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Telephone"
+msgstr "Telefono"
+
+msgid "Edit Telephone"
+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 ""
+
+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"
@@ -16385,7 +17011,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16412,21 +17038,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 "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16461,16 +17081,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16504,6 +17130,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16541,119 +17170,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 ""
@@ -16685,33 +17350,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 ""
@@ -16745,6 +17420,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 ""
@@ -16845,36 +17536,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 ""
@@ -16917,19 +17626,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 ""
@@ -17068,6 +17773,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 ""
@@ -17080,60 +17797,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 "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 ""
@@ -17358,41 +18149,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"
@@ -17401,7 +18218,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17413,12 +18230,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 ""
@@ -17470,88 +18377,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"
+msgid "biomass / waste"
msgstr ""
-msgid "pumped-storage"
-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 "battery charging"
+msgid "Boiling Water Reactor 4 (BWR-4)"
msgstr ""
-msgid "Power Station"
+msgid "Boiling Water Reactor 5 (BWR-5)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17563,6 +18573,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 ""
@@ -17578,6 +18603,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17596,11 +18624,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17709,10 +18735,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17724,7 +18750,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17745,6 +18771,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17757,9 +18786,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17829,7 +18855,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17850,13 +18876,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"
@@ -17865,7 +18891,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17893,6 +18918,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17929,10 +18960,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"
@@ -17962,7 +19014,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17974,19 +19026,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"
@@ -18022,7 +19074,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18235,6 +19287,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18274,24 +19332,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 ""
@@ -18301,15 +19368,6 @@ msgstr "Arbaro"
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18385,6 +19443,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18439,7 +19503,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18451,6 +19515,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Tombejo"
@@ -18490,40 +19557,67 @@ msgstr ""
msgid "Military"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
+msgstr ""
+
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18562,6 +19656,18 @@ msgstr ""
msgid "alphabetic"
msgstr "alfabeta"
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18730,21 +19836,50 @@ 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 ""
+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 ""
@@ -18790,21 +19925,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"
@@ -18826,7 +19964,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18922,18 +20060,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"
@@ -18943,7 +20090,10 @@ msgstr "barilo"
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18952,10 +20102,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18973,6 +20123,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18988,28 +20141,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"
@@ -19030,20 +20183,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"
@@ -19117,10 +20270,13 @@ msgstr ""
msgid "boundary"
msgstr "landlimo"
+msgid "sport"
+msgstr "sporto"
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19135,9 +20291,6 @@ msgstr "Vilaĝo/Urbo"
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr "Preĝejo"
-
msgid "Fuel Station"
msgstr ""
@@ -19165,6 +20318,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19210,10 +20366,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"
@@ -19225,7 +20411,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"
@@ -19243,7 +20429,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19360,19 +20546,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 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"
@@ -19391,7 +20688,46 @@ 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 "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 "Landsat"
@@ -19403,19 +20739,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 "skobbler heatmap"
@@ -19436,7 +20781,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19445,6 +20790,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19591,6 +20939,29 @@ 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 ""
@@ -19756,6 +21127,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19801,6 +21175,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19987,19 +21394,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20023,13 +21442,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20292,10 +21705,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20499,7 +21915,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"
@@ -20770,15 +22186,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20949,6 +22356,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 ""
@@ -20967,12 +22377,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21108,6 +22512,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 ""
@@ -21125,6 +22532,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 ""
@@ -21351,7 +22761,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."
@@ -21401,7 +22814,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21586,6 +22999,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21625,27 +23103,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 ""
@@ -22723,9 +24183,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 ""
@@ -23372,9 +24849,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23427,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 ""
@@ -23785,6 +25247,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23936,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 ""
@@ -24253,9 +25739,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24471,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 ""
@@ -24503,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 ""
@@ -24626,9 +26128,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24807,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"
@@ -25035,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 ""
@@ -25071,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..."
@@ -25223,9 +26814,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26211,9 +27799,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26492,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/es.po b/i18n/po/es.po
index ec52866..b78b4b0 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-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-08-30 21:10+0000\n"
-"Last-Translator: pertile <leopoldofederico at gmail.com>\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-08-31 04:33+0000\n"
-"X-Generator: Launchpad (build 16750)\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,9 @@ 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}"
@@ -59,6 +62,9 @@ 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"
@@ -163,20 +169,20 @@ 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 "
@@ -263,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"
@@ -302,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}"
@@ -321,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"
@@ -358,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"
@@ -423,7 +429,7 @@ msgid "Toggle dialogs panel"
msgstr "Activar panel de diálogos"
msgid "Toggle dialogs panel, maximize mapview"
-msgstr ""
+msgstr "Conmuta el panel de diálogos, maximiza la vista del mapa"
msgid "Distribute Nodes"
msgstr "Distribuir nodos"
@@ -550,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)"
@@ -678,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"
@@ -851,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"
@@ -1038,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 "
@@ -1061,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 "
@@ -1091,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>"
@@ -1276,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"
@@ -1433,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"
@@ -1541,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"
@@ -1620,7 +1642,7 @@ msgid ""
"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, <br /> se podrá requerir "
+"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?"
@@ -1842,6 +1864,9 @@ 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)"
@@ -1986,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}"
@@ -2086,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"
@@ -2573,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"
@@ -2788,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 "
@@ -2889,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}"
@@ -2925,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"
@@ -2953,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}''"
@@ -3074,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"
@@ -3142,12 +3175,11 @@ msgid "Reverse directional way."
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"
@@ -3176,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"
@@ -3201,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}"
@@ -3236,23 +3271,23 @@ msgstr ""
"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 "
@@ -3262,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 "
@@ -3275,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 "
@@ -3304,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}"
@@ -3338,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}»."
@@ -3518,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."
@@ -3639,8 +3670,8 @@ msgstr ""
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)"
@@ -3681,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"
@@ -3726,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"
@@ -3751,6 +3780,15 @@ 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 un edificio"
@@ -3813,6 +3851,9 @@ 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"
@@ -3899,6 +3940,15 @@ 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"
@@ -3974,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"
@@ -4034,15 +4091,15 @@ msgstr "Tipo de relación desconocida"
msgid "Relation is empty"
msgstr "La relación está vacía"
+msgid "Role verification problem"
+msgstr "Problema de verificación de rol"
+
msgid "<empty>"
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})"
@@ -4075,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}"
@@ -4226,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"
@@ -4302,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}"
@@ -4332,9 +4391,6 @@ msgstr "edificio"
msgid "area"
msgstr "área"
-msgid "Unclosed way"
-msgstr "Via sin cerrar"
-
msgid "Unconnected ways"
msgstr "Vías no conectadas"
@@ -4362,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\""
@@ -4431,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)"
@@ -4556,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 "Advertencia: no se pudo leer MOTD. La excepción fue: {0}"
+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"
@@ -4805,6 +4839,18 @@ 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"
@@ -4912,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)"
@@ -4949,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"
@@ -4978,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"
@@ -5250,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."
@@ -5257,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."
@@ -5264,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."
@@ -5282,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"
@@ -5298,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"
@@ -5355,16 +5404,6 @@ 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"
@@ -5648,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 ""
@@ -6250,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"
@@ -6333,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"
@@ -6425,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 "
@@ -6609,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"
@@ -6955,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 ""
@@ -7030,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 "Discardable key: selection Background"
+msgstr "Discardable key: selección de Fondo"
-msgid "Properties/Memberships"
-msgstr "Propiedades/Relaciones"
+msgid "Discardable key: foreground"
+msgstr "Clave descartable: frente"
-msgid "Properties for selected objects."
-msgstr "Propiedades de los objetos seleccionados."
+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"
@@ -7072,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)"
@@ -7242,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"
@@ -7609,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"
@@ -7759,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, "
@@ -7785,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"
@@ -7920,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."
@@ -8033,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"
@@ -8144,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"
@@ -8169,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:"
@@ -8240,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"
@@ -8330,11 +8405,11 @@ msgid "Unpacking {0} into {1}"
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 ""
-"Advertencia: no se puede descargar el archivo \"{0}\". El enlace de descarga "
-"\"{1} no es una URL válida. Se suspende la descarga."
+"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 "
@@ -8351,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"
@@ -8600,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 "
@@ -8621,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"
@@ -8637,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"
@@ -8644,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..."
@@ -8789,9 +8892,6 @@ 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..."
@@ -8803,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>"
@@ -8823,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:"
@@ -8979,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"
@@ -9012,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"
@@ -9396,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..."
@@ -9417,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"
@@ -9476,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"
@@ -9558,9 +9665,6 @@ 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"
@@ -9761,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}''..."
@@ -9790,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"
@@ -9802,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:"
@@ -10080,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}\""
@@ -10901,8 +10998,8 @@ msgstr "Añadir ajuste"
msgid "Advanced Background: Changed"
msgstr "Fondo avanzado: modificado"
-msgid "Advanced Background: NonDefalut"
-msgstr "Fondo avanzado: no es la opción por defecto"
+msgid "Advanced Background: NonDefault"
+msgstr ""
msgid "Current value is default."
msgstr "El valor actual es el valor por defecto"
@@ -10971,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"
@@ -11034,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"
@@ -11531,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"
@@ -11600,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"
@@ -11887,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"
@@ -11923,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}\""
@@ -11985,11 +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 ""
-"Advertencia: el valor en la preferencia \"{0}\" no se puede utilizar, se "
-"obtuvo \"{1}\". Utilizando método de autenticación \"Autenticación básica\""
+"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:"
@@ -11997,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. "
@@ -12113,18 +12227,12 @@ 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 "Atajo de fondo: Usuario"
@@ -12196,8 +12304,8 @@ msgstr "Aplicar Predeterminados"
msgid "New relation"
msgstr "Nueva relación"
-msgid "Change Properties"
-msgstr "Cambiar propiedades"
+msgid "Change Tags"
+msgstr "Cambiar Etiquetas"
msgid "Unknown requisite: {0}"
msgstr "Requisito desconocido: {0}"
@@ -12285,9 +12393,6 @@ msgstr "Rol preestablecido sin padre"
msgid "Preset sub element without parent"
msgstr "Subelmento preestablecido sin padre"
-msgid "Could not read tagging preset source: {0}"
-msgstr "No se pudo leer la fuente de las preferencias de etiquetas: {0}"
-
msgid "Error parsing {0}: "
msgstr "Error analizando {0}: "
@@ -12306,6 +12411,16 @@ msgstr "La muestra sólo es aplicable a la selección"
msgid "Search in tags"
msgstr "Buscar en etiquetas"
+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 (*.*)"
@@ -12341,9 +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 ""
@@ -12380,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."
@@ -12431,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..."
@@ -12570,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}."
@@ -12585,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}."
@@ -12679,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!"
@@ -12792,48 +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 ""
-"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 ""
-"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 "
@@ -12843,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..."
@@ -12876,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>"
@@ -12979,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}."
@@ -13191,9 +13329,15 @@ 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 "RemoteControl::Accepting connections on port {0}"
msgstr "ControlRemoto::Aceptando conexiones en el puerto {0}"
@@ -13243,6 +13387,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."
@@ -13279,20 +13432,20 @@ 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: "
@@ -13317,6 +13470,15 @@ msgstr "La capa contiene datos sin guardar - guardar en archivo."
msgid "Layer does not contain unsaved data."
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: "
"0.1"
@@ -13324,6 +13486,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}''"
@@ -13400,18 +13565,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}\""
@@ -13588,12 +13753,11 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr "Falló la actualización del complemento"
-msgid "Warning: failed to find plugin {0}"
-msgstr "Advertencia: hubo una falla al encontrar el complemento {0}"
+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"
@@ -13607,29 +13771,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 ""
-"Advertencia: hubo una falla al instalar el complemento \"{0}\" desde el "
-"archivo temporal descargado \"{1}\". {2}"
+"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}\""
@@ -13706,11 +13869,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..."
@@ -13724,12 +13886,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}''"
@@ -14190,16 +14367,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 "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 access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+"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}"
+"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]"
@@ -14211,35 +14386,81 @@ 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 "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?"
-msgstr "¿Usted desea pegar estas etiquetas?"
+msgid "reserved"
+msgstr "reservado"
-msgid "Clear buffer"
+msgid "Outdated Java version"
msgstr ""
-msgid "Ignore warnings"
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+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 "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 "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>"
@@ -14247,8 +14468,22 @@ 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 "Right click = copy to clipboard"
-msgstr "Clic derecho = copiar al portapapeles"
+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 "
@@ -14382,7 +14617,7 @@ msgstr "residencial"
msgctxt "natural"
msgid "scrub"
-msgstr "matorral"
+msgstr "monte bajo (arbustos, matorral o maleza)"
msgctxt "Relation type"
msgid "associatedStreet"
@@ -14598,6 +14833,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 ""
@@ -14928,6 +15170,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."
@@ -14991,9 +15236,6 @@ 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 "Editar características de OpenSeaMap"
@@ -15043,6 +15285,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"
@@ -15187,6 +15436,9 @@ msgstr "Terraplén"
msgid "Lit"
msgstr "Iluminación"
+msgid "Toll"
+msgstr "Peaje"
+
msgid "Motorway Link"
msgstr "Enlace de autopista"
@@ -15277,6 +15529,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"
@@ -15295,10 +15591,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"
@@ -15310,6 +15606,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"
@@ -15337,18 +15638,12 @@ msgstr "rotonda"
msgid "jughandle"
msgstr "cambio de sentido a distinto nivel"
-msgid "yes"
-msgstr "sí"
-
msgid "Road Restrictions"
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)"
@@ -15358,9 +15653,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"
@@ -15370,15 +15662,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"
@@ -15424,6 +15716,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)"
@@ -15508,6 +15803,9 @@ msgstr "Editar un puente"
msgid "viaduct"
msgstr "viaducto"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr "Intercambiador"
@@ -15626,21 +15924,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"
@@ -15656,11 +15963,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"
@@ -15695,8 +16002,8 @@ 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"
@@ -15764,12 +16071,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"
@@ -15785,15 +16098,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)"
@@ -15815,6 +16119,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"
@@ -15824,6 +16137,9 @@ msgstr "Ceda el paso"
msgid "Mini-roundabout"
msgstr "Mini-rotonda (a nivel o ligeramente abombada)"
+msgid "Edit Mini-Roundabout"
+msgstr "Editar Mini-Rotonda"
+
msgid "Direction"
msgstr "Dirección"
@@ -15833,11 +16149,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"
@@ -15869,9 +16182,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"
@@ -15914,6 +16224,12 @@ msgstr "Bloque de edición"
msgid "Allowed traffic:"
msgstr "Tráfico permitido:"
+msgid "Material"
+msgstr "Material"
+
+msgid "stone"
+msgstr "piedra"
+
msgid "Bollard"
msgstr "Bolardo"
@@ -15929,6 +16245,9 @@ msgstr "en ascenso"
msgid "removable"
msgstr "removible"
+msgid "plastic"
+msgstr "plástico"
+
msgid "Cycle Barrier"
msgstr "Barrera para bicicletas"
@@ -15936,10 +16255,10 @@ 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"
@@ -15998,20 +16317,14 @@ msgstr "cadena"
msgid "electric"
msgstr "eléctrica"
-msgid "roundpole"
-msgstr "troncos"
+msgid "pole"
+msgstr "poste"
msgid "split_rail"
msgstr "valla"
-msgid "chain"
-msgstr "cadena"
-
-msgid "hedge"
-msgstr "seto"
-
-msgid "pole"
-msgstr "poste"
+msgid "wire"
+msgstr "alambre"
msgid "Guard Rail"
msgstr "Guardarraíl, bionda o quitamiedos"
@@ -16041,6 +16354,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr "Zanja"
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr "Editar zanja"
@@ -16050,11 +16364,11 @@ msgstr "Bordillo"
msgid "Edit Kerb"
msgstr "Editar bordillo"
-msgid "Entrance"
-msgstr "Entrada"
+msgid "Entrance (barrier opening)"
+msgstr "Entrada (apertura de barrera)"
-msgid "Edit Entrance"
-msgstr "Editar una entrada"
+msgid "Edit Entrance (barrier opening)"
+msgstr "Editar Entrada (apertura de barrera)"
msgid "Gate"
msgstr "Puerta"
@@ -16108,12 +16422,6 @@ msgstr "estrecho"
msgid "stepover"
msgstr "peldaño"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "piedra"
-
msgid "Turnstile"
msgstr "Torno"
@@ -16174,12 +16482,21 @@ msgstr "Editar canal de desagüe"
msgid "Ditch"
msgstr "Acequia"
+msgid "Edit Ditch"
+msgstr "Editar zanja"
+
msgid "Stream"
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"
@@ -16219,9 +16536,6 @@ msgstr "Editar una presa"
msgid "Groyne"
msgstr "Espigón"
-msgid "Edit Groyne"
-msgstr "Editar espigón"
-
msgid "Breakwater"
msgstr "Rompeolas"
@@ -16255,6 +16569,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"
@@ -16336,18 +16665,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"
@@ -16423,8 +16757,8 @@ msgstr "turismo"
msgid "freight"
msgstr "carga"
-msgid "Service/Type"
-msgstr "Servicio/Tipo"
+msgid "Service type"
+msgstr "Tipo de servicio"
msgid "yard"
msgstr "yarda"
@@ -16447,11 +16781,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 (Hz)"
-msgstr "Frecuencia (Hz)"
+msgid "Frequency in Hertz (Hz)"
+msgstr "Frecuencia en hercios (HZ)"
+
+msgid "16.67"
+msgstr "16,67"
msgid "16.7"
msgstr "16.7"
@@ -16462,9 +16799,6 @@ msgstr "Vía estrecha"
msgid "Edit Narrow Gauge Rail"
msgstr "Editar vía estrecha"
-msgid "Types"
-msgstr "Tipos"
-
msgid "Monorail"
msgstr "Monoraíl"
@@ -16516,6 +16850,9 @@ msgstr "Editar vía de ferrocarril abandonada"
msgid "Level Crossing"
msgstr "Paso a nivel"
+msgid "Edit Level Crossing"
+msgstr "Editar paso a nivel"
+
msgid "Supervised"
msgstr "Supervisado"
@@ -16528,18 +16865,32 @@ msgstr "Señales sonoras"
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 "total"
+msgstr "Completa"
+msgctxt "crossing:barrier"
msgid "double_half"
-msgstr "dos mitades"
+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"
@@ -16639,13 +16990,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"
@@ -16655,11 +17004,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"
@@ -16678,12 +17025,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)"
@@ -16711,9 +17058,6 @@ msgstr "Plazas de aparcamiento"
msgid "Edit Parking space"
msgstr "Editar plazas de aparcamiento"
-msgid "rooftop"
-msgstr "en azotea"
-
msgid "Capacity"
msgstr "Capacidad (Coches)"
@@ -16733,13 +17077,34 @@ 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; Sa,Su 08:00-15:00; PH off"
+msgstr "L-V 08:30-20:00; Sa,Su 08:00-15:00; PH cerrado"
+
+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-Fr 08:30-20:00"
-msgstr "Lu-Vie 08:30-20: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 "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Ma-Sa 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 "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"
@@ -16888,6 +17253,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"
@@ -16909,6 +17277,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"
@@ -16936,6 +17310,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"
@@ -16960,22 +17340,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"
@@ -16997,9 +17361,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Partes"
-
msgid "Clothes"
msgstr "Ropas"
@@ -17149,13 +17510,13 @@ 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"
@@ -17188,14 +17549,17 @@ msgid "UIC name"
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 "Autobús"
@@ -17226,6 +17590,9 @@ msgstr "Funicular"
msgid "Ferry"
msgstr "Transbordador"
+msgid "Edit Platform"
+msgstr "Editar plataforma"
+
msgid "Bench"
msgstr "Banco"
@@ -17238,20 +17605,22 @@ msgstr "Silla de ruedas"
msgid "limited"
msgstr "limitado"
-msgid "only"
-msgstr "solamente"
-
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 "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"
@@ -17265,6 +17634,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"
@@ -17289,14 +17661,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"
@@ -17345,8 +17709,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"
@@ -17399,12 +17763,27 @@ msgstr "Terminal"
msgid "Edit Terminal"
msgstr "Editar Terminal"
-msgctxt "airport"
-msgid "Gate"
-msgstr "Puerta"
+msgid "Internet access"
+msgstr "Acceso a Internet"
-msgid "Edit Terminal Gate"
-msgstr "Editar Puerta de Terminal"
+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"
+
+msgid "Edit Terminal Gate"
+msgstr "Editar Puerta de Terminal"
msgid "Facilities"
msgstr "Instalaciones"
@@ -17421,21 +17800,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"
@@ -17625,9 +17989,6 @@ msgstr "Club de striptease"
msgid "Edit Stripclub"
msgstr "Editar club de striptease"
-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 "Tourism"
msgstr "Turismo"
@@ -17649,9 +18010,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"
@@ -17664,6 +18031,9 @@ msgstr "calle"
msgid "scheme"
msgstr "esquema"
+msgid "toposcope"
+msgstr "toposcopio"
+
msgid "Shown Area"
msgstr "Mostrar área"
@@ -17703,6 +18073,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"
@@ -17724,23 +18097,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"
@@ -17869,50 +18254,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"
@@ -17929,6 +18308,12 @@ msgstr "católico"
msgid "evangelical"
msgstr "evangélico"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "testigos de Jehová"
@@ -17941,6 +18326,9 @@ msgstr "metodista"
msgid "mormon"
msgstr "mormón"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ortodoxo"
@@ -17959,38 +18347,139 @@ msgstr "cuáquero"
msgid "roman_catholic"
msgstr "católico apostólico romano"
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr "Horarios del servicio"
+
+msgid "18:00"
+msgstr "18:00"
+
+msgid "sunset,sunrise"
+msgstr "amanecer, atardecer"
+
+msgid "Su 9:30,11:00"
+msgstr "D 9:30,11:00"
+
+msgid "Sa,Su,PH 9:00"
+msgstr "S, D, PH 9:00"
+
+msgid "Sa 18:00; Su 10:45"
+msgstr "S 18:00; D 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 ""
+"Vi 08:00-18:00; Abr 10-15 off; Jun 07:00-20:00; Ago off; Dec 24 08:00-24:00"
+
+msgid "Sa 10:00+"
+msgstr "S 10:00+"
+
+msgid "Mosque"
+msgstr "Mezquita"
+
+msgid "Edit Mosque"
+msgstr "Editar mezquita"
+
+msgid "mosque"
+msgstr "mezquita"
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr "chiita"
msgid "sunni"
msgstr "suní"
-msgid "Service Times"
-msgstr "Horarios del servicio"
+msgid "Synagogue"
+msgstr "Sinagoga"
-msgid "Su 10:00"
-msgstr "Do 10:00"
+msgid "Edit Synagogue"
+msgstr "Editar sinagoga"
-msgid "Su 10:30"
-msgstr "Do 10:30"
+msgid "synagogue"
+msgstr "sinagoga"
-msgid "Su 11:00"
-msgstr "Do 11:00"
+msgid "conservative"
+msgstr ""
-msgid "Opening Hours for visiting"
-msgstr "Horario de visita"
+msgid "reform"
+msgstr ""
-msgid "Recording Studio"
-msgstr "Estudio de grabación"
+msgid "Buddhist Temple"
+msgstr "Templo budista"
-msgid "Edit Studio"
-msgstr "Editar estudio"
+msgid "Edit Buddhist Temple"
+msgstr "Editar templo budista"
-msgid "audio"
-msgstr "audio"
+msgid "theravada"
+msgstr ""
-msgid "video"
-msgstr "vídeo"
+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"
@@ -18079,6 +18568,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"
@@ -18164,12 +18659,66 @@ msgstr "Veterinario"
msgid "Edit Veterinary"
msgstr "Editar veterinario"
-msgid "Drinking water"
-msgstr "Agua potable"
+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"
@@ -18179,6 +18728,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"
@@ -18188,31 +18761,37 @@ 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 "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"
@@ -18240,8 +18819,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"
@@ -18267,21 +18846,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 "plastic"
-msgstr "plástico"
-
msgid "Amount of Seats"
msgstr "Número de asientos"
@@ -18316,8 +18889,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 "completa"
msgid "Hide"
msgstr "Oculto"
@@ -18325,9 +18907,6 @@ msgstr "Oculto"
msgid "Lock"
msgstr "Esclusa"
-msgid "Drinking Water"
-msgstr "Fuente de agua potable"
-
msgid "Edit Source of Potable Water"
msgstr "Editar fuente de agua potable"
@@ -18359,6 +18938,9 @@ 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"
@@ -18396,117 +18978,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 "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"
@@ -18540,33 +19158,43 @@ 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 "9 bolos"
msgid "Edit 9pin"
msgstr "Editar bolos"
+msgid "pitch"
+msgstr "cancha de juego"
+
+msgid "sports_centre"
+msgstr "Polideportivo"
+
+msgid "stadium"
+msgstr "Estadio"
+
msgid "10pin"
msgstr "Bowling (bolos americanos)"
@@ -18600,6 +19228,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"
@@ -18700,38 +19344,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 "estilo de superficie"
+msgctxt "piste:grooming"
msgid "classic"
msgstr "clásico"
+msgctxt "piste:grooming"
msgid "mogul"
-msgstr "montículos"
+msgstr "montículo"
+
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr "patinaje"
+msgctxt "piste:grooming"
msgid "classic;skating"
-msgstr "clásico y libre"
+msgstr "clásico;patinaje"
+msgctxt "piste:grooming"
msgid "scooter"
-msgstr "angosta"
+msgstr "scooter"
+msgctxt "piste:grooming"
msgid "backcountry"
-msgstr "de campo abierto"
+msgstr "esquí libre"
msgid "Shooting"
msgstr "Tiro"
@@ -18772,19 +19434,15 @@ msgstr "Juegos gaélicos"
msgid "Edit Gaelic Games"
msgstr "Editar juegos gaélicos"
-msgctxt "gaelic game"
msgid "Hurling"
-msgstr "Hurling"
+msgstr "Lanzamiento"
-msgctxt "gaelic game"
msgid "Football"
-msgstr "Fútbol gaélico"
+msgstr "Fútbol"
-msgctxt "gaelic game"
msgid "Camogie"
msgstr "Camogie"
-msgctxt "gaelic game"
msgid "Rounders"
msgstr "Rounders"
@@ -18923,6 +19581,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"
@@ -18935,60 +19605,134 @@ 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 o escuela"
+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 "casa ecológica"
+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"
+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"
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr "terraza"
+msgctxt "building"
msgid "detached"
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"
@@ -19192,87 +19936,204 @@ msgstr "Pozo de agua"
msgid "Edit Water Well"
msgstr "Editar pozo de agua"
-msgid "Lighthouse"
-msgstr "Faro"
+msgid "Lighthouse"
+msgstr "Faro"
+
+msgid "Edit Lighthouse"
+msgstr "Editar faro"
+
+msgid "Edit Beacon"
+msgstr "Editar baliza"
+
+msgid "Street Lamp"
+msgstr "Farola"
+
+msgid "Edit Street Lamp"
+msgstr "Editar farola"
+
+msgid "Operation times"
+msgstr "Ciclo de funcionamiento"
+
+msgid "Mo-Fr 22:00-05:00"
+msgstr "Lu-Vi 22:00-05:00"
+
+msgid "Monitoring Station"
+msgstr "Estación de monitorización"
+
+msgid "Edit Monitoring Station"
+msgstr "Editar estación de monitorización"
+
+msgid "Monitoring:"
+msgstr "Monitoreo:"
+
+msgid "Weather"
+msgstr "Clima"
+
+msgid "Water level"
+msgstr "Nivel del agua"
+
+msgid "Tide Level"
+msgstr "Nivel de la marea"
+
+msgid "Traffic"
+msgstr "Tráfico"
+
+msgid "Air Quality"
+msgstr "Calidad del aire"
+
+msgid "Noise"
+msgstr "Ruido"
+
+msgid "GPS Signals"
+msgstr "Señales GPS"
+
+msgid "GLONASS Signals"
+msgstr "Señales GLONASS"
+
+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"
+
+msgid "Edit Survey Point"
+msgstr "Editar vértice geodésico"
+
+msgid "Surveillance Camera"
+msgstr ""
+
+msgid "Edit Surveillance Camera"
+msgstr "Editar cámara de vigilancia"
+
+msgid "indoor"
+msgstr "interiores"
+
+msgid "outdoor"
+msgstr "exteriores"
+
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "tienda"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
-msgid "Edit Lighthouse"
-msgstr "Editar faro"
+msgid "fixed"
+msgstr ""
-msgid "Edit Beacon"
-msgstr "Editar baliza"
+msgid "panning"
+msgstr ""
-msgid "Street Lamp"
-msgstr "Farola"
+msgid "dome"
+msgstr ""
-msgid "Edit Street Lamp"
-msgstr "Editar farola"
+msgid "Mounted on"
+msgstr ""
-msgid "Operation times"
-msgstr "Ciclo de funcionamiento"
+msgid "ceiling"
+msgstr ""
-msgid "Mo-Fr 22:00-05:00"
-msgstr "Lu-Vi 22:00-05:00"
+msgid "Direction in degrees"
+msgstr ""
-msgid "Measurement Station"
-msgstr "Estación de medición"
+msgid "Inclination in degrees"
+msgstr ""
-msgid "Edit Measurement Station"
-msgstr "Editar estación de medición"
+msgid "Height in meter (m)"
+msgstr "Altura en metros (m)"
-msgid "Measurement"
-msgstr "Medición"
+msgid "Power"
+msgstr "Energía"
-msgid "particulate_matter"
-msgstr "material particulado"
+msgid "Power Plant"
+msgstr "Planta generadora de energía"
-msgid "seismic"
-msgstr "sísmica"
+msgid "Edit Power Plant"
+msgstr "Editar planta generadora"
-msgid "water_level"
-msgstr "aforo de agua"
+msgid "Start date"
+msgstr "Fecha de inicio"
-msgid "weather"
-msgstr "atmosférica"
+msgid "Output forms of energy"
+msgstr "Formas de producción de energía"
-msgid "Recording"
-msgstr "Registro"
+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 "manually"
-msgstr "manual"
+msgid "electricity"
+msgstr "electricidad"
-msgid "automated"
-msgstr "automática"
+msgid "2 W"
+msgstr "2 W"
-msgid "remote"
-msgstr "remota"
+msgid "3 kW"
+msgstr "3 W"
-msgctxt "display"
-msgid "no"
-msgstr "no"
+msgid "5 MW"
+msgstr "5 MW"
-msgid "Survey Point"
-msgstr "Vértice geodésico"
+msgid "7 GW"
+msgstr "7 GW"
-msgid "Edit Survey Point"
-msgstr "Editar vértice geodésico"
+msgid "hot water"
+msgstr "agua caliente"
-msgid "Surveillance"
-msgstr "Cámara de vigilacia"
+msgid "hot air"
+msgstr "aire caliente"
-msgid "Edit Surveillance Camera"
-msgstr "Editar cámara de vigilancia"
+msgid "cold water"
+msgstr "agua fría"
-msgid "indoor"
-msgstr "interiores"
+msgid "cold air"
+msgstr "aire frío"
-msgid "outdoor"
-msgstr "exteriores"
+msgid "compressed air"
+msgstr "aire comprimido"
-msgid "public"
-msgstr "público"
+msgid "steam"
+msgstr "vapor"
-msgid "Power"
-msgstr "Energía"
+msgid "vacuum"
+msgstr "vacío"
msgid "Power Generator"
msgstr "Generador de energía"
@@ -19325,89 +20186,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 "solar photovoltaic"
+msgstr "fotovoltaico solar"
+
+msgid "solar_thermal_collector"
+msgstr "colector termo solar"
+
+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 "battery charging"
-msgstr "carga de batería"
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr "Reactor de agua hirviente 6 (BWR-6)"
-msgid "Power Station"
-msgstr "Central eléctrica"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr "Reactor de Uranio Deuterio Canadá (CANDU)"
-msgid "Edit Power Station"
-msgstr "Editar central eléctrica"
+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"
@@ -19418,6 +20386,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"
@@ -19433,6 +20416,9 @@ msgstr "Editar torre de electricidad"
msgid "Tower reference"
msgstr "Referencia de la torre"
+msgid "steel"
+msgstr "acero"
+
msgid "Pole"
msgstr "Poste"
@@ -19451,13 +20437,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"
@@ -19564,11 +20548,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"
@@ -19579,8 +20563,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"
@@ -19600,6 +20584,9 @@ msgstr "Mercado"
msgid "Edit Marketplace"
msgstr "Editar mercado"
+msgid "Organic"
+msgstr "Tienda de productos orgánicos"
+
msgid "Greengrocer"
msgstr "Frutería o verdulería"
@@ -19607,13 +20594,10 @@ msgid "Edit Greengrocer"
msgstr "Editar frutería o verdulería"
msgid "Farm Stand"
-msgstr "productos frescos de granja"
+msgstr "Productos de granja"
msgid "Edit Farm Stand"
-msgstr "Editar Venta de productos frescos de granja"
-
-msgid "Organic"
-msgstr "Tienda de productos orgánicos"
+msgstr "Editar productos de granja"
msgid "Edit Organic/Bio"
msgstr "Editar Orgánico/Bio"
@@ -19684,7 +20668,7 @@ msgstr "Editar sastrería"
msgid "Fabric"
msgstr "Textil"
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr "Editar tienda textil"
msgid "Electronic"
@@ -19697,7 +20681,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"
@@ -19705,22 +20689,21 @@ 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 "Vídeo"
@@ -19748,6 +20731,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"
@@ -19784,11 +20773,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"
@@ -19817,11 +20827,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"
@@ -19829,19 +20839,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"
@@ -19877,8 +20887,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"
@@ -19887,7 +20897,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"
@@ -20096,6 +21106,12 @@ msgstr "Pico"
msgid "Edit Peak"
msgstr "Editar pico"
+msgid "Saddle"
+msgstr "Collado"
+
+msgid "Edit Saddle"
+msgstr "Editar collado"
+
msgid "Glacier"
msgstr "Glaciar"
@@ -20135,26 +21151,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"
@@ -20162,15 +21187,6 @@ 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 "Pradera"
@@ -20214,10 +21230,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"
@@ -20246,6 +21262,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"
@@ -20288,8 +21310,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"
@@ -20306,8 +21328,8 @@ 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"
@@ -20318,6 +21340,9 @@ msgstr "Camposanto (para antiguos lugares de enterramiento)"
msgid "Edit Graveyard"
msgstr "Editar camposanto"
+msgid "shinto"
+msgstr "sintoísmo"
+
msgid "Cemetery"
msgstr "Cementerio"
@@ -20394,6 +21419,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"
@@ -20430,6 +21482,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)"
@@ -20598,21 +21662,50 @@ msgstr "Ruta general"
msgid "Edit general route"
msgstr "Editar ruta general"
+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 "sendero"
+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"
@@ -20658,21 +21751,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"
@@ -20694,7 +21790,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)"
@@ -20790,18 +21886,27 @@ msgstr "vías que pasan bajo el puente"
msgid "way forming the outline footprint"
msgstr "vía que conforma el contorno"
-msgid "nodes forming the outline"
-msgstr "nodos que conforman el contorno"
+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"
@@ -20811,8 +21916,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"
@@ -20820,11 +21928,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"
@@ -20841,6 +21949,9 @@ msgstr "rápidos"
msgid "railwaypoint"
msgstr "punto ferroviario"
+msgid "raildashed"
+msgstr "raildashed"
+
msgid "railyard"
msgstr "terminal ferroviaria"
@@ -20856,29 +21967,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"
@@ -20898,20 +22009,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"
@@ -20968,7 +22079,7 @@ msgid "natural"
msgstr "espacio natural"
msgid "scrub"
-msgstr "matorral"
+msgstr "monte bajo"
msgid "heath"
msgstr "monte"
@@ -20985,11 +22096,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"
@@ -21003,9 +22117,6 @@ msgstr "Población/Ciudad"
msgid "One Way"
msgstr "Sentido único"
-msgid "Church"
-msgstr "Iglesia"
-
msgid "Fuel Station"
msgstr "Gasolinera"
@@ -21033,6 +22144,9 @@ 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 "unclassified highway sin nombre"
@@ -21078,11 +22192,41 @@ 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 "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr "lago/laguna utilizado como piscina"
-msgid "incline without highway"
-msgstr "incline sin highway"
+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 "junction sin highway"
@@ -21093,8 +22237,8 @@ msgstr "lanes sin highway"
msgid "lcn without highway"
msgstr "lcn sin highway"
-msgid "lit without highway"
-msgstr "lit sin highway"
+msgid "lit without highway/railway/piste/parking/platform"
+msgstr "iluminación sin vía/ferrocarril/pista/estacionamiento/plataforma"
msgid "living_street without highway"
msgstr "living_street sin highway"
@@ -21111,8 +22255,8 @@ msgstr "motorroad sin highway"
msgid "ntd_id without highway"
msgstr "ntd_id sin highway"
-msgid "oneway without highway"
-msgstr "oneway sin highway"
+msgid "oneway without highway or railway"
+msgstr "sentido único sin vía o camino"
msgid "sac_scale without highway"
msgstr "sac_scale sin highway"
@@ -21228,20 +22372,131 @@ msgstr "canal sin waterway"
msgid "have_riverbank without waterway"
msgstr "have_riverbank sin waterway"
-msgid "tunnel without highway/railway/waterway"
-msgstr "tunnel sin highway/railway/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"
-msgstr "bridge sin highway/railway/waterway"
+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"
-msgstr "psv sin highway/railway/waterway"
+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 "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 "maxspeed without highway/railway/traffic_sign"
-msgstr "maxspeed sin 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"
msgstr "religion sin denomination"
@@ -21250,32 +22505,87 @@ msgid "unknown christian denomination"
msgstr "denomination desconocido de christian"
msgid "unknown muslim denomination"
-msgstr ""
+msgstr "denominación musulmana desconocida"
msgid "unknown jewish denomination"
-msgstr ""
+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 "Landsat"
+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 "Yahoo Sat"
+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 ""
+"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 ""
+"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 ""
-msgid "MapBox Satellite"
+msgid "HDDM (Humanitarian OpenStreetMap)"
msgstr ""
+msgid "MapBox Satellite"
+msgstr "MapBox Satellite"
+
msgid "MapQuest Open Aerial"
-msgstr ""
+msgstr "MapQuest Open Aerial"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "Trazas GPS de OpenStreetMap"
msgid "OpenStreetMap (Mapnik)"
msgstr ""
@@ -21283,8 +22593,8 @@ msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik Blanco y Negro)"
-msgid "Skobbler"
-msgstr "Skobbler"
+msgid "skobbler"
+msgstr "skobbler"
msgid "skobbler heatmap"
msgstr "mapa de calor de skobbler"
@@ -21304,8 +22614,8 @@ msgstr "OpenStreetMap (estilo alemán)"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Cambodia, Laos, Thailand, Vietnam bilingüe"
-msgid "2u"
-msgstr "2u"
+msgid "osmfr"
+msgstr "osmfr"
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI blanco-y-negro 2.5m"
@@ -21313,6 +22623,9 @@ 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 "Graz: Basiskarte (mapa base)"
@@ -21461,6 +22774,33 @@ 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 ""
+"Antiguo mapa de Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+
+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 "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)"
@@ -21626,6 +22966,9 @@ msgstr "USGS Imágenes Satelitales a Gran Escala"
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr "OSM TIGER Estados Unidos 2012 Superposición de rutas"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr "OSM - Tiger Mapa Editado"
@@ -21671,6 +23014,39 @@ msgstr "OS Escocés Popular histórica"
msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr "NLS - Bartolomé Mdia Pulgada, 1897-1907"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr "Planos de Ciudad OS, Cupar 1854 (NLS)"
+
+msgid "OSM Export"
+msgstr "Exportar a OSM"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Exportar datos de tráfico a archivo de red SUMO."
+
+msgid "SUMO Export"
+msgstr "Exportar a SUMO"
+
+msgid "Export"
+msgstr "Exportar"
+
+msgid "Port:"
+msgstr "Puerto:"
+
+msgid "refresh the port list"
+msgstr "refrescar la lista de puertos"
+
+msgid "Configure"
+msgstr "Configurar"
+
+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 "Columbus V-900 CSV Files"
msgstr "Archivos CSV Columbus V-900"
@@ -21884,6 +23260,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."
@@ -21905,14 +23293,8 @@ 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 "Perfil del terreno para la traza '' {0}''."
@@ -22188,11 +23570,14 @@ 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 "Housenumber increment:"
-msgstr "Incremento del número de portal:"
+msgid "House number increment:"
+msgstr ""
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
@@ -22247,7 +23632,7 @@ msgid "Open NanoLog file..."
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 ""
@@ -22255,10 +23640,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."
@@ -22405,8 +23790,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"
@@ -22789,15 +24174,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"
@@ -22993,6 +24369,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"
@@ -23012,12 +24391,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "alto"
-
-msgid "medium"
-msgstr "medio"
-
msgid "symbol"
msgstr "símbolo"
@@ -23172,6 +24545,11 @@ 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"
@@ -23191,6 +24569,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=...)?"
@@ -23442,8 +24823,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."
@@ -23495,7 +24879,7 @@ msgstr "Eliminar el esquema seleccionado de la lista"
msgid "Color Schemes"
msgstr "Esquemas de color"
-msgid "Adress"
+msgid "Address"
msgstr "Dirección"
msgid "Split area"
@@ -23686,6 +25070,71 @@ msgstr "Limpiar registro"
msgid "Show users on map"
msgstr "Mostrar usuarios en el mapa"
+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"
@@ -23725,27 +25174,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."
@@ -23968,7 +25399,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"
@@ -24332,16 +25763,16 @@ msgid "Determined {0} away"
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 "Almacenar rectificación de imágenes..."
@@ -24354,7 +25785,7 @@ msgstr ""
"calibración) a un servidor"
msgid "Store calibration geometry"
-msgstr ""
+msgstr "Almacenar la geometría de calibración"
msgid "Store imagery offset"
msgstr "Almacenar rectificación de imágenes"
@@ -24363,6 +25794,8 @@ 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 "
@@ -24388,30 +25821,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 "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 ""
+msgstr "Ajustar imagen aérea"
msgid "Adjust the position of the selected imagery layer"
-msgstr ""
+msgstr "Ajustar la posición de la capa de imagen aérea seleccionada"
msgid "Please select the imagery layer to adjust."
-msgstr ""
+msgstr "Por favor seleccione la capa de imagen aérea a ajustar."
msgid "Start adjusting"
-msgstr ""
+msgstr "Iniciar el ajuste."
msgid "There are currently no imagery layer to adjust."
-msgstr ""
+msgstr "Actualmente no hay ninguna capa de imagen aérea para ajustar."
msgid "No layers to adjust"
-msgstr ""
+msgstr "No hay capas para ajustar"
msgid "Normal"
msgstr "Normal"
@@ -24468,10 +25906,10 @@ msgid "Importing..."
msgstr "Importando..."
msgid "SVG files [ImportVec plugin] (*.svg)"
-msgstr ""
+msgstr "Archivos SVG [complemento ImportVec] (*.svg)"
msgid "Please open or create data layer before importing"
-msgstr ""
+msgstr "Por favor abra o cree una capa de datos antes de la importación"
msgid "InfoMode"
msgstr "ModoInfo"
@@ -24483,12 +25921,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"
@@ -24497,7 +25937,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 "
@@ -24535,16 +25975,16 @@ msgid "sealing Digraph"
msgstr "Diagrama de sellado"
msgid "calculating Strong Connectedness"
-msgstr ""
+msgstr "calculando la Fortaleza de Conexión"
msgid "creating DigraphLayer"
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"
@@ -24553,19 +25993,19 @@ msgid "Channel-Digraph creation"
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"
@@ -24580,36 +26020,39 @@ 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 "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"
@@ -24857,10 +26300,10 @@ 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"
@@ -24908,8 +26351,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"
@@ -24939,21 +26407,34 @@ 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 "Download from Overpass API ..."
msgstr "Descargando desde la API Overpass..."
@@ -24965,150 +26446,162 @@ msgid "Overpass query: "
msgstr ""
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 ""
+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 ""
+msgstr "Dividir estos datos por barrio (admin_level=11)."
msgid "CSV files"
msgstr "Archivos CSV"
@@ -25120,7 +26613,7 @@ msgid "ODS files"
msgstr "Archivos ODS"
msgid "Shapefiles"
-msgstr ""
+msgstr "Archivos hape"
msgid "MapInfo files"
msgstr "Archivos MapInfo"
@@ -25141,34 +26634,37 @@ msgid "OpenData XML files"
msgstr "Archivos XML OpenData"
msgid "Download open data"
-msgstr ""
+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 "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 "
@@ -25189,8 +26685,9 @@ msgstr[1] ""
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 "Módulos"
@@ -25208,10 +26705,10 @@ msgid "Update modules"
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 "
@@ -25221,7 +26718,7 @@ msgstr ""
"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:"
@@ -25230,25 +26727,27 @@ msgid "Add Open Data Module description URL."
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 "Datos en bruto"
@@ -25276,7 +26775,7 @@ msgstr ""
"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 "Servidor API Overpass usado para descargar datos OSM"
@@ -25294,30 +26793,35 @@ msgid "Download modules"
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 7Zip file..."
msgstr ""
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}'' "
@@ -25325,9 +26829,27 @@ 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 detect Coordinate Reference System.\n"
@@ -25341,68 +26863,84 @@ msgid "Unable to detect CRS !"
msgstr ""
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 "Haga clic para actualizar los módulos activados"
@@ -25414,31 +26952,38 @@ 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 "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:"
@@ -25456,35 +27001,40 @@ 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 "
@@ -25494,57 +27044,66 @@ msgstr ""
"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}''"
@@ -25580,9 +27139,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 "Process queue"
msgstr "Procesando cola"
@@ -25639,26 +27195,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"
@@ -25708,22 +27252,25 @@ 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 "Download PBF"
msgstr ""
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"
@@ -25819,10 +27366,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..."
@@ -25933,10 +27482,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"
@@ -26002,9 +27551,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 "Do you want to save current calibration of layer {0}?"
+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 "¿Desea guardar la calibración de la capa actual {0}?"
+
msgid "Load Picture Calibration..."
msgstr "Cargar calibración de imágenes..."
@@ -26015,19 +27585,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..."
@@ -26042,7 +27612,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..."
@@ -26062,7 +27632,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"
@@ -26071,7 +27641,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"
@@ -26080,7 +27650,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"
@@ -26089,7 +27659,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"
@@ -26098,7 +27668,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"
@@ -26107,40 +27677,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"
@@ -26157,13 +27727,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?"
@@ -26177,102 +27753,109 @@ 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 "Download Osmosis poly"
msgstr ""
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"
@@ -26281,7 +27864,7 @@ msgid "Public Transport: Catch GTFS stops"
msgstr "Transporte público: capturar paradas GTFS"
msgid "skipped"
-msgstr ""
+msgstr "omitido"
msgid "Public Transport: Disable GTFS"
msgstr "Transporte público: desactivar GTFS"
@@ -26293,7 +27876,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"
@@ -26312,13 +27895,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"
@@ -26330,7 +27913,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"
@@ -26339,7 +27922,7 @@ msgid "Time window"
msgstr "Período de tiempo"
msgid "seconds"
-msgstr ""
+msgstr "segundos"
msgid "Move Threshold"
msgstr "Umbral de desplazamiento"
@@ -26366,40 +27949,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"
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 "[interrupción]"
msgid " [ID] {0}"
-msgstr ""
+msgstr " [ID] {0}"
msgid "Route patterns ..."
msgstr "Patrones de ruta..."
@@ -26408,7 +27991,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"
@@ -26429,34 +28012,34 @@ 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 "Transporte público: cambiar tipo de parada"
@@ -26468,33 +28051,32 @@ 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"
@@ -26521,7 +28103,7 @@ msgid "Public Transport: Suggest stops"
msgstr "Transporte público: paradas sugeridas"
msgid "Stopname"
-msgstr ""
+msgstr "Nombre de parada"
msgid "Public Transport: Detach waypoints"
msgstr "Transporte público: separar punto de ruta"
@@ -26545,28 +28127,30 @@ msgid "Specify role"
msgstr "Especificar rol"
msgid "Change relation member roles to {0}"
-msgstr ""
+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}"
@@ -26578,16 +28162,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:"
@@ -26596,7 +28180,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:"
@@ -26605,7 +28189,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"
@@ -26614,7 +28198,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"
@@ -26623,16 +28207,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"
@@ -26644,34 +28230,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 ""
+msgstr "Se encontró una vía sin e lrol ''iner'' o ''outer''"
msgid "Revert changeset fully"
msgstr "Conjunto de cambios revertido en su totalidad"
@@ -26689,10 +28275,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}"
@@ -26707,54 +28296,80 @@ 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 "Spain"
msgstr ""
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"
@@ -26766,7 +28381,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}\""
@@ -26799,10 +28414,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"
@@ -26832,7 +28447,7 @@ msgid "Fastest"
msgstr "La más rápida"
msgid "Ignore oneways"
-msgstr ""
+msgstr "Ignorar sentidos únicos"
msgid "Reverse route"
msgstr "Ruta inversa"
@@ -26849,9 +28464,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)"
@@ -26865,107 +28477,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 "Could not back up file. Exception is: {0}"
msgstr "No se pudo hacer copia de seguridad. La excepción es: {0}"
@@ -26992,7 +28619,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 "
@@ -27008,9 +28635,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"
@@ -27028,22 +28669,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"
@@ -27056,6 +28697,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 ""
@@ -27090,27 +28732,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"
@@ -27187,7 +28831,7 @@ msgid "Street name: "
msgstr "Nombre de calle: "
msgid "Building: "
-msgstr ""
+msgstr "Edificio: "
msgid "Even/Odd"
msgstr "Par/Impar"
@@ -27268,6 +28912,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"
@@ -27309,6 +29046,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..."
@@ -27354,6 +29096,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 "
@@ -27392,7 +29135,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"
@@ -27415,10 +29158,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"
@@ -27442,7 +29185,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"
@@ -27472,22 +29215,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"
@@ -27541,23 +29281,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"
@@ -27566,16 +29313,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"
@@ -27587,19 +29334,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..."
@@ -27721,7 +29468,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 "
@@ -27914,7 +29665,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"
@@ -28198,6 +29949,8 @@ 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 "Select if the data should be added into a new layer"
msgstr "Seleccionar si los datos deberían adicionarse a una nueva capa"
@@ -28244,7 +29997,7 @@ msgstr ""
"único nodo."
msgid "Extract node from line"
-msgstr ""
+msgstr "Extraer el nodo de la línea"
msgid "Paste Relations"
msgstr "Pegar relaciones"
@@ -28276,6 +30029,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 ""
@@ -28291,6 +30046,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"
@@ -28330,7 +30087,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"
@@ -28347,7 +30104,7 @@ msgstr ""
"Preferencias)"
msgid "Ask every time"
-msgstr ""
+msgstr "Consultar siempre"
msgid "Configure custom URL"
msgstr "Configurar URL personalizada"
@@ -28356,16 +30113,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"
@@ -28395,7 +30154,7 @@ 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 "
@@ -28420,31 +30179,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 "
@@ -28454,15 +30240,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}"
@@ -28545,6 +30335,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"
@@ -28572,6 +30364,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"
@@ -28579,9 +30373,6 @@ msgstr "Deseleccionar nodos"
msgid "Removes all nodes from selection"
msgstr "Elimina todos los nodos de la selección"
-msgid "Video"
-msgstr "Vídeo"
-
msgid "Import Video"
msgstr "Importar vídeo"
@@ -28680,12 +30471,15 @@ 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 vídeo"
@@ -28709,7 +30503,7 @@ msgid "mute"
msgstr "silenciar"
msgid "Walking Papers Scanned Map"
-msgstr ""
+msgstr "Mapas Escaneados de Walking Papers"
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -28816,26 +30610,30 @@ 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 "{0}.Wikipedia.org"
@@ -28882,9 +30680,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr "Ingrese el lenguaje de Wikipedia"
-msgid "Add Tag"
-msgstr "Añadir etiqueta"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
@@ -28893,10 +30688,10 @@ msgstr ""
"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 56e5e2a..82a56ae 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-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-08-06 18:50+0000\n"
-"Last-Translator: Margus Värton <margus at dakar.ee>\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-08-07 04:33+0000\n"
-"X-Generator: Launchpad (build 16721)\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,9 @@ 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}"
@@ -57,6 +60,9 @@ msgid "INFO: {0}"
msgstr "INFO: {0}"
msgid "DEBUG: {0}"
+msgstr "DEBUG: {0}"
+
+msgid "Cause: "
msgstr ""
msgid "Executing platform startup hook"
@@ -164,18 +170,14 @@ 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 "
@@ -263,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"
@@ -291,7 +290,7 @@ msgid "download"
msgstr "allalaetule"
msgid "problem"
-msgstr ""
+msgstr "probleem"
msgid "previous"
msgstr "eelmine"
@@ -302,6 +301,9 @@ msgstr "järgmine"
msgid "Nothing selected to zoom to."
msgstr "Ei ole valitud miskit, millele suumida."
+msgid "Information"
+msgstr "Info"
+
msgid "Zoom to {0}"
msgstr "Suumi {0}"
@@ -358,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."
@@ -544,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)"
@@ -660,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"
@@ -824,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"
@@ -1016,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 "
@@ -1041,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>"
@@ -1159,13 +1151,13 @@ msgid "Could not rename file ''{0}''"
msgstr "Faili ''{0}'' ei ole võimalik ümber nimetada."
msgid "Restart"
-msgstr ""
+msgstr "Taaskäivita"
msgid "Restart the application."
-msgstr ""
+msgstr "Taaskäivita rakendus"
msgid "Click to restart later."
-msgstr ""
+msgstr "Kliki, et taaskäivitada hiljem"
msgid "Reverse way"
msgstr "Pööra joone suund"
@@ -1218,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"
@@ -1243,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"
@@ -1255,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"
@@ -1285,7 +1274,7 @@ msgid "Copy to clipboard and close"
msgstr "Kopeeri puhvrisse ja sulge."
msgid "Report bug"
-msgstr ""
+msgstr "Teata veast"
msgid "Close"
msgstr "Sulge"
@@ -1368,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"
@@ -1470,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"
@@ -1692,7 +1702,7 @@ msgid "Slower Forward"
msgstr "Aeglasemalt edasi"
msgid "Download GPS"
-msgstr ""
+msgstr "GPS allalaadimine"
msgid "Downloading GPS data"
msgstr "GPS andmete allalaadimine"
@@ -1713,7 +1723,7 @@ msgid "Download Compressed OSM"
msgstr ""
msgid "Download OSM"
-msgstr ""
+msgstr "OSM allalaadimine"
msgid "Downloading data"
msgstr "Laadin andmeid alla"
@@ -1726,10 +1736,10 @@ 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 ""
@@ -1756,6 +1766,9 @@ 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)"
@@ -1902,7 +1915,7 @@ msgid "Snap to node projections"
msgstr ""
msgid "Disable"
-msgstr ""
+msgstr "Välja lülitamine"
msgid "0,90,..."
msgstr ""
@@ -1980,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] ""
@@ -2412,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 ""
@@ -2608,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 ""
@@ -2699,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 ""
@@ -2735,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"
@@ -2761,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}''"
@@ -2877,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] ""
@@ -2937,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 ""
@@ -2970,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 ""
@@ -2994,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 ""
@@ -3024,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 ""
@@ -3044,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 ""
@@ -3053,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 ""
@@ -3073,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}"
@@ -3104,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}''."
@@ -3261,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 ""
@@ -3369,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 ""
@@ -3407,9 +3425,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3448,6 +3463,9 @@ msgstr ""
msgid "Running test {0}"
msgstr "Jooksev test: {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Aadressid"
@@ -3458,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"
@@ -3531,6 +3558,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3613,6 +3643,15 @@ 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"
@@ -3682,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 ""
@@ -3739,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})"
@@ -3777,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 ""
@@ -3914,8 +3959,8 @@ 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 ""
@@ -3989,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 ""
@@ -4019,9 +4067,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -4046,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 ""
@@ -4112,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)"
@@ -4142,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 ""
@@ -4232,7 +4260,7 @@ 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"
@@ -4426,7 +4454,7 @@ msgid "File"
msgstr "Fail"
msgid "Session"
-msgstr ""
+msgstr "Seanss"
msgid "View"
msgstr "Vaade"
@@ -4459,7 +4487,7 @@ 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"
@@ -4467,6 +4495,18 @@ 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"
@@ -4551,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 ""
@@ -4571,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 ""
@@ -4873,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"
@@ -4910,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"
@@ -4962,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 ""
@@ -5205,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 ""
@@ -5219,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 ""
@@ -5546,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: "
@@ -5575,7 +5612,7 @@ msgid " as \"{0}\""
msgstr ""
msgid "{0} Nodes: "
-msgstr ""
+msgstr "{0} sõlme: "
msgid "Bounding box: "
msgstr ""
@@ -5750,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"
@@ -5833,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"
@@ -5924,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 ""
@@ -6006,7 +6075,7 @@ 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 ""
@@ -6033,7 +6102,7 @@ msgid "My changesets"
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 "
@@ -6095,9 +6164,6 @@ msgstr "Uuenda sisu"
msgid "Update the changeset content from the OSM server"
msgstr "Värskenda muutuskogumit OSM serverist"
-msgid "Show history"
-msgstr "Näita ajalugu"
-
msgid "Download and show the history of the selected objects"
msgstr "Laadi alla valitud objektid ja näita nende ajalugu"
@@ -6329,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 ""
@@ -6352,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 "
@@ -6365,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"
@@ -6397,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 ""
@@ -6452,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"
@@ -6494,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)"
@@ -6654,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"
@@ -6974,21 +7062,40 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
-msgid "Bookmarks"
-msgstr "Järjehoidjad"
+msgid "{0} - {1} ({2})"
+msgstr ""
-msgid "<html>There is currently no download area selected.</html>"
+msgid "Wrong number of arguments for bookmark"
msgstr ""
-msgid ""
-"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
-"maxlat): </html>"
+msgid "Error reading bookmark entry: %s"
msgstr ""
-"<html><strong>Praegune allalaaditav ala</strong> (minlon, minlat, maxlon, "
-"maxlat): </html>"
-msgid "Create bookmark"
-msgstr "Pane järjehoidja"
+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"
+
+msgid "<html>There is currently no download area selected.</html>"
+msgstr ""
+
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+"<html><strong>Praegune allalaaditav ala</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+
+msgid "Create bookmark"
+msgstr "Pane järjehoidja"
msgid "Add a bookmark for the currently selected download area"
msgstr "Loo järjehoidja praeguse allalaaditava ala jaoks"
@@ -7052,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"
@@ -7116,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, "
@@ -7142,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 ""
@@ -7258,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."
@@ -7360,6 +7437,9 @@ msgid ""
msgstr ""
"<html>Versioon <strong>{0}</strong> loodud <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7447,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"
@@ -7470,6 +7550,12 @@ msgstr "Kommenteeri lühidalt üleslaaditavaid muudatusi."
msgid "Enter an upload comment"
msgstr "Sisesta kommentaar"
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr "Muutuskogumi id:"
@@ -7536,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"
@@ -7618,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 ""
@@ -7633,8 +7718,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,7 +7728,7 @@ 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 ""
@@ -7855,12 +7939,6 @@ 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 "
@@ -7869,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 ""
@@ -7884,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"
@@ -7891,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 ..."
@@ -8006,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..."
@@ -8018,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>"
@@ -8034,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:"
@@ -8180,7 +8289,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8210,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"
@@ -8574,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 ""
@@ -8595,6 +8701,9 @@ msgstr "Kataloogis {0} faile ei leitud\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Viga failide laadimisel kataloogist {0}\n"
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr "Geosildistatud fotod"
@@ -8652,6 +8761,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8720,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 ""
@@ -8905,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}''..."
@@ -8927,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"
@@ -8937,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:"
@@ -9163,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}''"
@@ -9195,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 ""
@@ -9541,7 +9648,7 @@ 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 ""
+msgstr "Kas soovid kohe taaskäivitada?"
msgid "Remote Control"
msgstr "Kaugjuhtimine"
@@ -9579,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"
@@ -9862,6 +9969,45 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "imagery"
+msgstr ""
+
+msgid "Reset preferences"
+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 "Load profile"
+msgstr ""
+
+msgid "Save {0} profile"
+msgstr ""
+
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
+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 "Select Setting Type:"
msgstr ""
@@ -9951,6 +10097,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 ""
@@ -10004,6 +10153,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 ""
@@ -10460,6 +10614,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 ""
@@ -10515,16 +10675,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"
@@ -10657,7 +10817,7 @@ msgid "Projection configuration is valid."
msgstr ""
msgid "Validate"
-msgstr ""
+msgstr "Kontrolli"
msgid "Parameter information..."
msgstr ""
@@ -10759,10 +10919,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"
@@ -10785,49 +10945,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 ""
@@ -10836,11 +10998,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 ""
@@ -10850,12 +11016,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 ""
@@ -10872,8 +11044,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:"
@@ -10882,20 +11054,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 "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 ""
@@ -10926,6 +11103,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 ""
@@ -10937,13 +11115,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 ""
@@ -10977,14 +11155,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"
@@ -11057,8 +11229,8 @@ msgstr "Rakenda"
msgid "New relation"
msgstr "Uus relatsioon"
-msgid "Change Properties"
-msgstr "Muuda atribuute"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -11136,9 +11308,6 @@ msgstr ""
msgid "Preset sub element without parent"
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}: "
@@ -11157,6 +11326,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 ""
@@ -11181,46 +11358,93 @@ 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 "Cut"
-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 ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+"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 "Deleted node {0} is part of way {1}"
+msgid "Right click = copy to clipboard"
+msgstr "Paremklõps = kopeerimine lõikepuhvrisse"
+
+msgid "Missing mandatory attribute ''{0}''."
msgstr ""
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 ""
msgid ""
-"Relation with external id ''{0}'' refers to a missing primitive with "
-"external id ''{1}''."
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
msgstr ""
-msgid "Deleted member {0} is used by relation {1}"
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
msgstr ""
-msgid "All Formats"
-msgstr "Kõik formaadid"
-
-msgid "Downloading points {0} to {1}..."
-msgstr "Laadin alla punkte alates {0} kuni {1}..."
-
-msgid "Contacting OSM Server..."
-msgstr "Ühendun OSM serveriga..."
-
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
-"capabilities. Got ''{2}''"
+"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 "Cut"
+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 "Kõik formaadid"
+
+msgid "Downloading points {0} to {1}..."
+msgstr "Laadin alla punkte alates {0} kuni {1}..."
+
+msgid "Contacting OSM Server..."
+msgstr "Ühendun OSM serveriga..."
+
+msgid ""
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"capabilities. Got ''{2}''"
msgstr ""
msgid "Failed to parse date ''{0}'' replied by server."
@@ -11259,28 +11483,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..."
@@ -11379,6 +11601,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 ""
@@ -11394,12 +11619,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}."
@@ -11478,8 +11711,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!"
@@ -11577,35 +11810,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 ""
@@ -11615,8 +11824,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 ..."
@@ -11643,10 +11852,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>"
@@ -11730,8 +11936,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}."
@@ -11934,7 +12140,7 @@ msgstr "Uute objektide loomine"
msgid "Read protocol version"
msgstr "Protokolli versiooni lugemine"
-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}"
@@ -11980,6 +12186,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."
@@ -12010,19 +12225,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 ""
@@ -12044,11 +12259,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 ""
@@ -12118,13 +12345,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}''"
@@ -12271,10 +12498,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"
@@ -12289,22 +12516,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}''"
@@ -12379,8 +12605,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..."
@@ -12395,12 +12620,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 ""
@@ -12729,12 +12967,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12745,9 +12982,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 ""
@@ -12779,8 +13059,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 "
@@ -13106,6 +13400,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 ""
@@ -13208,7 +13507,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 ""
@@ -13345,6 +13644,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."
@@ -13394,9 +13696,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 ""
@@ -13433,6 +13732,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 ""
@@ -13565,6 +13869,9 @@ msgstr "Teetamm"
msgid "Lit"
msgstr "Valgustatud"
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13655,6 +13962,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"
@@ -13673,10 +14024,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"
@@ -13688,6 +14039,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13715,18 +14069,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 ""
@@ -13736,9 +14084,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13748,15 +14093,15 @@ msgstr ""
msgid "private"
msgstr ""
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr ""
msgid "forestry"
msgstr ""
-msgid "no"
-msgstr "ei"
-
msgid "official"
msgstr ""
@@ -13802,6 +14147,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)"
@@ -13886,6 +14234,9 @@ msgstr "Lisa andmeid"
msgid "viaduct"
msgstr "viadukt"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13990,20 +14341,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"
@@ -14020,10 +14380,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"
@@ -14059,7 +14419,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -14128,12 +14488,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"
@@ -14149,15 +14515,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 ""
@@ -14179,15 +14536,27 @@ msgstr ""
msgid "tiger"
msgstr ""
-msgid "Stop"
+msgid "Crossing attendant"
msgstr ""
-msgid "Give way"
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
+msgid "Stop"
+msgstr ""
+
+msgid "Give way"
msgstr ""
msgid "Mini-roundabout"
msgstr "Miniring"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -14197,10 +14566,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"
@@ -14233,9 +14599,6 @@ msgstr ""
msgid "Passing Place"
msgstr "Möödasõidukoht"
-msgid "Edit Passing Place"
-msgstr "Lisa andmeid"
-
msgid "Turning Circle"
msgstr ""
@@ -14278,6 +14641,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr "Materjal"
+
+msgid "stone"
+msgstr "kivi"
+
msgid "Bollard"
msgstr "Pollar"
@@ -14293,6 +14662,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr "plastikust"
+
msgid "Cycle Barrier"
msgstr ""
@@ -14362,20 +14734,17 @@ msgstr ""
msgid "electric"
msgstr "elekter"
-msgid "roundpole"
-msgstr ""
+msgid "pole"
+msgstr "post"
-msgid "split_rail"
+msgid "Guard Rail"
msgstr ""
-msgid "chain"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "hedge"
-msgstr "hekk"
-
-msgid "pole"
-msgstr "post"
+msgid "wire"
+msgstr ""
msgid "Guard Rail"
msgstr ""
@@ -14405,8 +14774,9 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
-msgstr "Lisa andmeid"
+msgstr ""
msgid "Kerb"
msgstr ""
@@ -14414,11 +14784,11 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
-msgstr "Lisa andmeid"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Värav"
@@ -14471,12 +14841,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr "Materjal"
-
-msgid "stone"
-msgstr "kivi"
-
msgid "Turnstile"
msgstr ""
@@ -14537,12 +14901,21 @@ msgstr "Lisa andmeid"
msgid "Ditch"
msgstr "Kraav"
+msgid "Edit Ditch"
+msgstr "Lisa andmeid"
+
msgid "Stream"
msgstr "Oja"
msgid "Edit Stream"
msgstr "Lisa andmeid"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Kanal"
@@ -14582,9 +14955,6 @@ msgstr "Lisa andmeid"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr "Lisa andmeid"
-
msgid "Breakwater"
msgstr ""
@@ -14618,6 +14988,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 ""
@@ -14699,18 +15084,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 ""
@@ -14786,7 +15176,7 @@ msgstr "turism"
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14810,10 +15200,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"
@@ -14825,9 +15218,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr "Lisa andmeid"
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14879,6 +15269,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14891,18 +15284,32 @@ msgstr ""
msgid "Barrier"
msgstr ""
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
msgid "half"
-msgstr "pool"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "täis"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "double_half"
msgstr ""
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -15002,13 +15409,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"
@@ -15018,13 +15423,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 ""
@@ -15041,10 +15444,10 @@ msgstr ""
msgid "underground"
msgstr "maa-alune"
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -15074,9 +15477,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Mahutavus"
@@ -15098,10 +15498,29 @@ 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"
@@ -15251,6 +15670,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr "Lisa andmeid"
+msgid "Voltage"
+msgstr "Pinge"
+
msgid "Amperage"
msgstr ""
@@ -15272,6 +15694,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr "Lisa andmeid"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15279,7 +15707,7 @@ msgid "Edit Tyres"
msgstr "Lisa andmeid"
msgid "Contact:"
-msgstr ""
+msgstr "Kontakt:"
msgid "Phone Number"
msgstr "Telefoninumber"
@@ -15299,6 +15727,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr "Lisa andmeid"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15323,22 +15757,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 ""
@@ -15360,9 +15778,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Riided"
@@ -15557,23 +15972,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 ""
@@ -15587,6 +16005,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Pink"
@@ -15599,21 +16020,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"
@@ -15624,7 +16047,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"
@@ -15648,21 +16074,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"
@@ -15706,11 +16124,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"
@@ -15760,6 +16178,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"
@@ -15782,21 +16215,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"
@@ -15986,9 +16404,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr "Turism"
@@ -16010,9 +16425,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"
@@ -16025,6 +16446,9 @@ msgstr "tänav"
msgid "scheme"
msgstr "skeem"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Näidatud ala"
@@ -16064,6 +16488,9 @@ msgstr "... võimalikud muud transpordiviisid."
msgid "Information Board"
msgstr "Infotahvel"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Infotahvli sisu"
@@ -16085,23 +16512,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"
@@ -16143,7 +16582,7 @@ msgid "Edit Water Park"
msgstr "Lisa andmeid"
msgid "Sauna"
-msgstr ""
+msgstr "Saun"
msgid "Edit Sauna"
msgstr "Lisa andmeid"
@@ -16155,10 +16594,10 @@ msgid "Edit Horse riding"
msgstr ""
msgid "Brothel"
-msgstr ""
+msgstr "Lõbumaja"
msgid "Edit Brothel"
-msgstr ""
+msgstr "Lisa andmeid"
msgid "Playground"
msgstr "Mänguväljak"
@@ -16230,51 +16669,45 @@ msgstr "Kunstiteos"
msgid "Edit Artwork"
msgstr "Lisa andmeid"
+msgid "Recording Studio"
+msgstr "Salvestusstuudio"
+
+msgid "Edit Studio"
+msgstr "Lisa andmeid"
+
+msgid "audio"
+msgstr "heli"
+
+msgid "video"
+msgstr "video"
+
msgid "Place of Worship"
msgstr "Pühapaik"
-msgid "Edit Place of Worship"
-msgstr "Lisa andmeid"
+msgid "Church"
+msgstr "Kirik"
-msgid "Religion"
-msgstr "Religioon"
+msgid "Edit Church"
+msgstr ""
-msgid "bahai"
+msgid "Building type"
msgstr ""
-msgid "buddhist"
-msgstr "budist"
+msgid "basilica"
+msgstr ""
-msgid "christian"
-msgstr "kristlane"
-
-msgid "hindu"
-msgstr "hindu"
-
-msgid "jain"
+msgid "cathedral"
msgstr ""
-msgid "jewish"
-msgstr "juudi"
-
-msgid "muslim"
-msgstr "moslem"
-
-msgid "sikh"
-msgstr "sikh"
-
-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"
@@ -16290,6 +16723,12 @@ msgstr "katoliku"
msgid "evangelical"
msgstr "evangeelne"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "jehoovatunnistajad"
@@ -16302,6 +16741,9 @@ msgstr "metodist"
msgid "mormon"
msgstr "mormoon"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ortodoksne"
@@ -16320,38 +16762,138 @@ msgstr "kveeker"
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 "šiia"
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"
-msgstr "Salvestusstuudio"
+msgid "Buddhist Temple"
+msgstr ""
-msgid "Edit Studio"
-msgstr "Lisa andmeid"
+msgid "Edit Buddhist Temple"
+msgstr ""
-msgid "audio"
-msgstr "heli"
+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 "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"
@@ -16440,6 +16982,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"
@@ -16521,12 +17069,66 @@ msgstr "Loomaarst"
msgid "Edit Veterinary"
msgstr "Lisa andmeid"
-msgid "Drinking water"
+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"
@@ -16536,6 +17138,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"
@@ -16545,30 +17171,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"
@@ -16597,8 +17229,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"
@@ -16624,21 +17256,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 "plastic"
-msgstr "plastikust"
-
msgid "Amount of Seats"
msgstr "Istekohtade arv"
@@ -16673,8 +17299,17 @@ msgstr "Lisa andmeid"
msgid "Height"
msgstr "Kõrgus"
+msgctxt "height"
msgid "low"
-msgstr "madal"
+msgstr ""
+
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
msgid "Hide"
msgstr "Peida"
@@ -16682,9 +17317,6 @@ msgstr "Peida"
msgid "Lock"
msgstr "Lukusta"
-msgid "Drinking Water"
-msgstr "Joogivesi"
-
msgid "Edit Source of Potable Water"
msgstr ""
@@ -16716,6 +17348,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr "Läbimõõt (mm)"
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16753,119 +17388,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"
@@ -16897,26 +17568,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 ""
@@ -16924,6 +17596,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr "spordihall"
+
+msgid "stadium"
+msgstr "staadion"
+
msgid "10pin"
msgstr "Bowling"
@@ -16957,6 +17638,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"
@@ -17013,7 +17710,7 @@ msgid "Skating"
msgstr "Uisutamine"
msgid "Edit Skating"
-msgstr "Lisa andmeid"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -17057,36 +17754,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 ""
@@ -17129,19 +17844,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 ""
@@ -17280,6 +17991,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"
@@ -17292,38 +18015,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 ""
@@ -17331,21 +18089,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"
@@ -17546,90 +18343,206 @@ msgstr "Lisa andmeid"
msgid "Water Well"
msgstr "Veekaev"
-msgid "Edit Water Well"
-msgstr "Lisa andmeid"
+msgid "Edit Water Well"
+msgstr "Lisa andmeid"
+
+msgid "Lighthouse"
+msgstr "Majakas"
+
+msgid "Edit Lighthouse"
+msgstr "Lisa andmeid"
+
+msgid "Edit Beacon"
+msgstr "Lisa andmeid"
+
+msgid "Street Lamp"
+msgstr "Tänavavalgusti"
+
+msgid "Edit Street Lamp"
+msgstr "Lisa andmeid"
+
+msgid "Operation times"
+msgstr "Töötamise aeg"
+
+msgid "Mo-Fr 22:00-05:00"
+msgstr "E-R 22:00-05:00"
+
+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 "Noise"
+msgstr ""
+
+msgid "GPS Signals"
+msgstr ""
+
+msgid "GLONASS Signals"
+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 "Geodeetiline punkt"
+
+msgid "Edit Survey Point"
+msgstr "Lisa andmeid"
+
+msgid "Surveillance Camera"
+msgstr ""
+
+msgid "Edit Surveillance Camera"
+msgstr "Lisa andmeid"
+
+msgid "indoor"
+msgstr "ruumides"
+
+msgid "outdoor"
+msgstr "väljas"
+
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "pood"
+
+msgid "bank"
+msgstr ""
-msgid "Lighthouse"
-msgstr "Majakas"
+msgid "Camera"
+msgstr ""
-msgid "Edit Lighthouse"
-msgstr "Lisa andmeid"
+msgid "fixed"
+msgstr ""
-msgid "Edit Beacon"
-msgstr "Lisa andmeid"
+msgid "panning"
+msgstr ""
-msgid "Street Lamp"
-msgstr "Tänavavalgusti"
+msgid "dome"
+msgstr ""
-msgid "Edit Street Lamp"
-msgstr "Lisa andmeid"
+msgid "Mounted on"
+msgstr ""
-msgid "Operation times"
-msgstr "Töötamise aeg"
+msgid "ceiling"
+msgstr ""
-msgid "Mo-Fr 22:00-05:00"
-msgstr "E-R 22:00-05:00"
+msgid "Direction in degrees"
+msgstr ""
-msgid "Measurement Station"
-msgstr "Mõõtejaam"
+msgid "Inclination in degrees"
+msgstr ""
-msgid "Edit Measurement Station"
-msgstr "Lisa andmeid"
+msgid "Height in meter (m)"
+msgstr ""
-msgid "Measurement"
-msgstr "Mõõtmine"
+msgid "Power"
+msgstr "Elektrivõrk"
-msgid "particulate_matter"
-msgstr "puisteaine"
+msgid "Power Plant"
+msgstr ""
-msgid "seismic"
-msgstr "seismoloogia"
+msgid "Edit Power Plant"
+msgstr ""
-msgid "water_level"
-msgstr "veetase"
+msgid "Start date"
+msgstr ""
-msgid "weather"
-msgstr "ilm"
+msgid "Output forms of energy"
+msgstr ""
-msgid "Recording"
-msgstr "Salvestamine"
+msgid "(please add this information to the generators if possible)"
+msgstr ""
-msgid "manually"
-msgstr "käsitsi"
+msgid "electricity"
+msgstr ""
-msgid "automated"
-msgstr "automatiseeritud"
+msgid "2 W"
+msgstr ""
-msgid "remote"
-msgstr "kaugjuhitav"
+msgid "3 kW"
+msgstr ""
-msgctxt "display"
-msgid "no"
-msgstr "ei"
+msgid "5 MW"
+msgstr ""
-msgid "Survey Point"
-msgstr "Geodeetiline punkt"
+msgid "7 GW"
+msgstr ""
-msgid "Edit Survey Point"
-msgstr "Lisa andmeid"
+msgid "hot water"
+msgstr ""
-msgid "Surveillance"
-msgstr "järelvalve"
+msgid "hot air"
+msgstr ""
-msgid "Edit Surveillance Camera"
-msgstr "Lisa andmeid"
+msgid "cold water"
+msgstr ""
-msgid "indoor"
-msgstr "ruumides"
+msgid "cold air"
+msgstr ""
-msgid "outdoor"
-msgstr "väljas"
+msgid "compressed air"
+msgstr ""
-msgid "public"
-msgstr "avalik"
+msgid "steam"
+msgstr ""
-msgid "Power"
-msgstr "Elektrivõrk"
+msgid "vacuum"
+msgstr ""
msgid "Power Generator"
msgstr "Elektrigeneraator"
@@ -17682,89 +18595,192 @@ 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 "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 "Elektrialajaam"
@@ -17775,6 +18791,21 @@ 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"
@@ -17790,6 +18821,9 @@ msgstr "Lisa andmeid"
msgid "Tower reference"
msgstr "Masti number"
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr "Elektripost"
@@ -17808,11 +18842,9 @@ msgstr "Lisa andmeid"
msgid "Line type"
msgstr "Joonetüüp"
-msgctxt "Power Line"
msgid "line"
-msgstr "liin"
+msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17921,11 +18953,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"
@@ -17936,8 +18968,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"
@@ -17957,6 +18989,9 @@ msgstr "Turg"
msgid "Edit Marketplace"
msgstr "Lisa andmeid"
+msgid "Organic"
+msgstr "Ökokaubad"
+
msgid "Greengrocer"
msgstr "Aedviljad"
@@ -17969,9 +19004,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr "Ökokaubad"
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -18041,8 +19073,8 @@ msgstr "Lisa andmeid"
msgid "Fabric"
msgstr "Kangad"
-msgid "Edit Fabric"
-msgstr "Lisa andmeid"
+msgid "Edit Fabric Shop"
+msgstr ""
msgid "Electronic"
msgstr "Elektroonika"
@@ -18062,14 +19094,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"
@@ -18077,9 +19109,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"
@@ -18105,6 +19136,12 @@ msgstr "Lisa andmeid"
msgid "Edit Automated Teller Machine"
msgstr "Lisa andmeid"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr "Kaubamaja"
@@ -18141,11 +19178,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"
@@ -18174,8 +19232,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"
@@ -18186,20 +19244,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"
@@ -18234,8 +19292,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"
@@ -18388,10 +19446,10 @@ msgid "Edit County"
msgstr "Lisa andmeid"
msgid "Population"
-msgstr ""
+msgstr "Elanikke"
msgid "Post code"
-msgstr "Posti kood"
+msgstr "Sihtnumber"
msgid "City"
msgstr "Suurlinn"
@@ -18447,6 +19505,12 @@ msgstr "Mäetipp"
msgid "Edit Peak"
msgstr "Lisa andmeid"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Liustik"
@@ -18486,41 +19550,41 @@ 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"
-msgid "Edit Forest Landuse"
-msgstr "Lisa andmeid"
-
-msgid "coniferous"
-msgstr "okasmets"
-
-msgid "deciduous"
-msgstr "lehtmets"
-
-msgid "mixed"
-msgstr "segamets"
+msgid "Edit Forest Landuse"
+msgstr "Lisa andmeid"
msgid "Grassland"
msgstr ""
@@ -18597,6 +19661,12 @@ msgstr "Niit/Karjamaa"
msgid "Edit Meadow Landuse"
msgstr "Lisa andmeid"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Viinapuuistandus"
@@ -18651,8 +19721,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"
@@ -18663,6 +19733,9 @@ msgstr "Matmispaik"
msgid "Edit Graveyard"
msgstr "Lisa andmeid"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Kalmistu"
@@ -18738,6 +19811,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"
@@ -18757,7 +19857,7 @@ msgid "Country code"
msgstr "Riigi kood"
msgid "Address Interpolation"
-msgstr ""
+msgstr "Aadresside interpoleerimine"
msgid "Edit Address Interpolation"
msgstr "Lisa andmeid"
@@ -18774,9 +19874,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"
@@ -18784,10 +19896,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"
@@ -18942,20 +20054,49 @@ msgstr ""
msgid "Edit general route"
msgstr ""
+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"
@@ -19002,20 +20143,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 ""
@@ -19038,7 +20182,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -19134,18 +20278,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"
@@ -19155,8 +20308,11 @@ msgstr "tõke"
msgid "motorroad"
msgstr ""
-msgid "highway_track"
-msgstr "teerada"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "teenused"
@@ -19164,10 +20320,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"
@@ -19185,6 +20341,9 @@ msgstr ""
msgid "railwaypoint"
msgstr "raudteepunkt"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19200,29 +20359,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"
@@ -19242,20 +20401,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"
@@ -19329,10 +20488,13 @@ msgstr "marsruut"
msgid "boundary"
msgstr "piir"
+msgid "sport"
+msgstr "sport"
+
msgid "place"
msgstr "koht"
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19347,9 +20509,6 @@ msgstr "Asula/Linn"
msgid "One Way"
msgstr "ühesuunaline"
-msgid "Church"
-msgstr "Kirik"
-
msgid "Fuel Station"
msgstr "Tankla"
@@ -19377,6 +20536,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19422,10 +20584,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"
@@ -19437,7 +20629,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"
@@ -19455,7 +20647,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19572,19 +20764,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 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"
@@ -19603,7 +20906,46 @@ 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 "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 "Landsat"
@@ -19615,19 +20957,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 "skobbler heatmap"
@@ -19648,7 +20999,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19657,6 +21008,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19803,6 +21157,29 @@ 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 ""
@@ -19968,6 +21345,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -20013,6 +21393,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -20214,6 +21627,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 ""
@@ -20235,13 +21660,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20383,7 +21802,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 ""
@@ -20504,10 +21923,13 @@ 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 "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20628,7 +22050,7 @@ msgid "Selected Bug Info"
msgstr ""
msgid "Handy Address Interpolation Functions"
-msgstr ""
+msgstr "Käepärased aadresside interpoleerimise funktsioonid"
msgid "Define Address Interpolation"
msgstr ""
@@ -20688,7 +22110,7 @@ msgid "State:"
msgstr ""
msgid "Post Code:"
-msgstr ""
+msgstr "Sihtnumber:"
msgid "Country:"
msgstr ""
@@ -20711,7 +22133,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"
@@ -20987,20 +22409,11 @@ msgid "Building address"
msgstr "hoone aadress"
msgid "House number:"
-msgstr ""
+msgstr "Maja number:"
msgid "Street Name:"
msgstr "Tänava nimi:"
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -21171,6 +22584,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 ""
@@ -21189,12 +22605,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21331,6 +22741,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 ""
@@ -21348,6 +22761,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 ""
@@ -21388,46 +22804,6 @@ msgid ""
"Use the normal Cadastre Grab menu."
msgstr ""
-msgid ""
-"This commune is not vectorized.\n"
-"Please use the other menu entry to georeference a \"Plan image\""
-msgstr ""
-
-msgid "Extract commune boundary"
-msgstr ""
-
-msgid "Only on vectorized layers"
-msgstr ""
-
-msgid "Cancel current grab"
-msgstr ""
-
-msgid "Cancel current grab (only vector images)"
-msgstr ""
-
-msgid "Cadastre grab"
-msgstr ""
-
-msgid "Download Image from French Cadastre WMS"
-msgstr ""
-
-msgid "Cadastre: {0}"
-msgstr ""
-
-msgid "Georeference an image"
-msgstr ""
-
-msgid "Grab non-georeferenced image"
-msgstr ""
-
-msgid "Georeferencing interrupted"
-msgstr ""
-
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
-msgstr ""
-
msgid "Load layer from cache"
msgstr ""
@@ -21574,7 +22950,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."
@@ -21624,7 +23003,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21848,27 +23227,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 ""
@@ -22951,9 +24312,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 ""
@@ -23249,7 +24627,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 "
@@ -23272,13 +24650,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 ""
@@ -23412,7 +24792,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. "
@@ -23604,9 +24984,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Tekkis viga: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23614,7 +24991,7 @@ msgid "Open OpenStreetBugs"
msgstr "Ava Openstreetbugs"
msgid "Opens the OpenStreetBugs window and activates the automatic download"
-msgstr "Avab Openstreetbugs'i akna ning aktiveerib automaatse allalaadimise"
+msgstr "Avab Openstreetbugs’i akna ning aktiveerib automaatse allalaadimise"
msgid "Bug list"
msgstr ""
@@ -23659,18 +25036,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 ""
@@ -24017,6 +25382,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -24168,6 +25554,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 ""
@@ -24485,9 +25874,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr "Peatuste loomine GPX-failist"
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24703,6 +26089,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 ""
@@ -24735,15 +26124,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 ""
@@ -24858,9 +26263,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -25039,19 +26441,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"
@@ -25220,7 +26622,7 @@ msgid "Reverse a terrace"
msgstr ""
msgid "Reverses house numbers on a terrace."
-msgstr ""
+msgstr "Pöörab ridaelamu majanumbrid."
msgid "Reverse a Terrace"
msgstr ""
@@ -25267,6 +26669,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 ""
@@ -25303,6 +26794,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..."
@@ -25455,9 +26949,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25864,7 +27355,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"
@@ -26448,9 +27939,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr "Video"
-
msgid "Import Video"
msgstr ""
@@ -26731,9 +28219,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 de50db1..432d73c 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-08-04 03:41+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-08-05 04:34+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr "Atzeko planoko erabilera baldintzak"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -165,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 "
@@ -265,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"
@@ -304,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"
@@ -361,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"
@@ -545,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 ""
@@ -661,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"
@@ -817,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"
@@ -1012,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 "
@@ -1042,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>"
@@ -1226,9 +1219,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1376,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"
@@ -1485,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"
@@ -1777,6 +1783,9 @@ 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)"
@@ -2007,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] ""
@@ -2453,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 ""
@@ -2661,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 "
@@ -2758,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"
@@ -2794,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"
@@ -2820,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}''"
@@ -2931,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"
@@ -2991,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"
@@ -3024,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"
@@ -3048,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}"
@@ -3078,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 "
@@ -3102,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 "
@@ -3115,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 "
@@ -3141,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}"
@@ -3172,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"
@@ -3339,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 ""
@@ -3447,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 ""
@@ -3485,9 +3491,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3526,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"
@@ -3550,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 ""
@@ -3611,6 +3626,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Nodo bikoiztuak"
@@ -3695,6 +3713,15 @@ 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"
@@ -3764,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 ""
@@ -3821,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})"
@@ -3859,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}"
@@ -4000,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"
@@ -4077,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"
@@ -4107,9 +4143,6 @@ msgstr "eraikina"
msgid "area"
msgstr "azalera"
-msgid "Unclosed way"
-msgstr "Itxi-gabeko bidea"
-
msgid "Unconnected ways"
msgstr ""
@@ -4138,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''"
@@ -4207,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)"
@@ -4331,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"
@@ -4577,6 +4589,18 @@ 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"
@@ -4683,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 ""
@@ -4997,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."
@@ -5010,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"
@@ -5042,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"
@@ -5098,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"
@@ -5358,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 ""
@@ -5888,6 +5909,9 @@ msgstr "Erakutsi/Ezabatu"
msgid "Information about layer"
msgstr "Geruzari buruzko informazioa"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5971,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"
@@ -6062,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 ""
@@ -6233,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 ""
@@ -6520,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"
@@ -6586,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"
@@ -6628,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)"
@@ -6788,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"
@@ -7106,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"
@@ -7237,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, "
@@ -7261,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 ""
@@ -7374,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."
@@ -7473,6 +7526,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7560,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 ""
@@ -7581,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 ""
@@ -7647,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"
@@ -7723,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 ""
@@ -7738,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"
@@ -7954,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 "
@@ -7968,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 ""
@@ -7983,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 ""
@@ -7990,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 ..."
@@ -8103,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] ""
@@ -8115,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>"
@@ -8131,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:"
@@ -8277,7 +8360,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8307,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"
@@ -8665,9 +8748,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8686,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 ""
@@ -8743,6 +8826,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8809,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 ""
@@ -8992,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}''..."
@@ -9014,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"
@@ -9024,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:"
@@ -9245,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}''"
@@ -9960,6 +10041,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -10028,6 +10142,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -10081,6 +10198,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 ""
@@ -10537,6 +10659,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 ""
@@ -10600,7 +10728,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 ""
@@ -10858,21 +10986,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"
@@ -10894,6 +11007,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 ""
@@ -10944,8 +11072,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:"
@@ -10954,20 +11082,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 ""
@@ -11049,14 +11182,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"
@@ -11129,6 +11256,9 @@ msgstr ""
msgid "New relation"
msgstr ""
+msgid "Change Tags"
+msgstr ""
+
msgid "Change Properties"
msgstr "Aldatu propietateak"
@@ -11208,9 +11338,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -11229,6 +11356,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 ""
@@ -11258,9 +11393,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 ""
@@ -11291,7 +11466,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 ""
@@ -11331,28 +11506,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..."
@@ -11447,6 +11620,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11462,12 +11638,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}."
@@ -11546,7 +11730,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11645,35 +11829,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 ""
@@ -11683,8 +11843,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 ..."
@@ -11711,10 +11871,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>"
@@ -11798,8 +11955,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}."
@@ -11996,7 +12153,7 @@ 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}"
@@ -12042,6 +12199,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."
@@ -12072,19 +12238,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 ""
@@ -12106,11 +12272,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 ""
@@ -12180,13 +12358,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}''"
@@ -12329,10 +12507,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"
@@ -12347,22 +12525,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}''"
@@ -12431,8 +12608,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..."
@@ -12447,18 +12623,33 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
-msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+msgid "Plugin list download error"
msgstr ""
-msgid "Writing plugin list to local cache ''{0}''"
+msgid "JOSM failed to download plugin list:"
msgstr ""
-msgid "Parsing plugin list from site ''{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 ""
+
+msgid "Parsing plugin list from site ''{0}''"
+msgstr ""
+
+msgid ""
"Failed to parse plugin list document from site ''{0}''. Skipping site. "
"Exception was: {1}"
msgstr ""
@@ -12771,12 +12962,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12787,9 +12977,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 ""
@@ -12821,9 +13054,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."
@@ -13151,6 +13398,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 ""
@@ -13405,6 +13657,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."
@@ -13463,9 +13718,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 ""
@@ -13510,6 +13762,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 ""
@@ -13652,6 +13909,9 @@ msgstr "Lubeta"
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "Ordainsaria"
+
msgid "Motorway Link"
msgstr "Autobide-lotura"
@@ -13742,6 +14002,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"
@@ -13760,11 +14064,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"
@@ -13775,6 +14079,9 @@ msgstr "sarrera-bidea (etxe, baserri eta abarrerantz)"
msgid "parking_aisle"
msgstr "aparkalekuetako-bidea"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Aparkalekuetako-bidea"
@@ -13802,18 +14109,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)"
@@ -13823,9 +14124,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr "norakoa"
-
msgid "delivery"
msgstr "banaketa"
@@ -13835,15 +14133,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"
@@ -13889,6 +14187,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)"
@@ -13973,6 +14274,9 @@ msgstr "Zubia editatu"
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -14077,20 +14381,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"
@@ -14107,10 +14420,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"
@@ -14146,7 +14459,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -14215,12 +14528,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"
@@ -14236,15 +14555,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)"
@@ -14266,6 +14576,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"
@@ -14275,6 +14594,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Errotonda txikia"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Norabidea"
@@ -14284,11 +14606,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"
@@ -14320,9 +14639,6 @@ msgstr "taula"
msgid "Passing Place"
msgstr "Aurreratze-lekua"
-msgid "Edit Passing Place"
-msgstr "Aurreratze-lekua editatu"
-
msgid "Turning Circle"
msgstr "Biraketa-zirkulua"
@@ -14362,8 +14678,20 @@ msgstr "Blokea"
msgid "Edit Block"
msgstr ""
-msgid "Allowed traffic:"
-msgstr "Baimendutako trafikoa"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "Material"
+msgstr "Materiala"
+
+msgid "stone"
+msgstr "harria"
msgid "Bollard"
msgstr "Bolardoa"
@@ -14380,6 +14708,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr "plastikoa"
+
msgid "Cycle Barrier"
msgstr "Bizikletentzako oztopoa"
@@ -14449,21 +14780,18 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
-msgstr ""
+msgid "pole"
+msgstr "postea"
-msgid "split_rail"
+msgid "Guard Rail"
msgstr ""
-msgid "chain"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "hedge"
+msgid "wire"
msgstr ""
-msgid "pole"
-msgstr "postea"
-
msgid "Guard Rail"
msgstr ""
@@ -14492,8 +14820,9 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
-msgstr "Erretena editatu"
+msgstr ""
msgid "Kerb"
msgstr ""
@@ -14501,11 +14830,11 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
-msgstr "Sarrera"
+msgid "Entrance (barrier opening)"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Sarrera editatu"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Atea"
@@ -14558,12 +14887,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr "Materiala"
-
-msgid "stone"
-msgstr "harria"
-
msgid "Turnstile"
msgstr "Tornua"
@@ -14624,12 +14947,21 @@ msgstr "Isurbidea editatu"
msgid "Ditch"
msgstr "Erretena"
+msgid "Edit Ditch"
+msgstr "Erretena editatu"
+
msgid "Stream"
msgstr "Errekastoa"
msgid "Edit Stream"
msgstr "Errekastoa editatu"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Kanala"
@@ -14669,9 +15001,6 @@ msgstr "Presa editatu"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14705,6 +15034,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"
@@ -14786,18 +15130,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 ""
@@ -14873,7 +15222,7 @@ msgstr "turismoa"
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14897,11 +15246,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"
@@ -14912,9 +15264,6 @@ msgstr "Trenbide estua"
msgid "Edit Narrow Gauge Rail"
msgstr "Trenbide estua editatu"
-msgid "Types"
-msgstr "Motak"
-
msgid "Monorail"
msgstr "Monoraila"
@@ -14966,6 +15315,9 @@ msgstr ""
msgid "Level Crossing"
msgstr "Trenbide-pasagunea"
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14978,29 +15330,64 @@ msgstr ""
msgid "Barrier"
msgstr ""
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
msgid "half"
-msgstr "erdia"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "beteta"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "double_half"
msgstr ""
msgid "Crossing"
msgstr "Pasagunea"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Pasabide mota"
-msgid "Turntable"
-msgstr "Biraketa-plataforma"
+msgid "Sound signals"
+msgstr ""
-msgid "Buffer Stop"
-msgstr "Bidearen topea"
+msgid "Barrier"
+msgstr ""
-msgid "Aerialway"
-msgstr "Erremonte"
+msgid "half"
+msgstr "erdia"
+
+msgid "full"
+msgstr "beteta"
+
+msgid "double_half"
+msgstr ""
+
+msgid "Crossing"
+msgstr "Pasagunea"
+
+msgid "Crossing type"
+msgstr "Pasabide mota"
+
+msgid "Turntable"
+msgstr "Biraketa-plataforma"
+
+msgid "Buffer Stop"
+msgstr "Bidearen topea"
+
+msgid "Aerialway"
+msgstr "Erremonte"
msgid "Chair Lift"
msgstr "Teleaulkia"
@@ -15089,11 +15476,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -15105,13 +15490,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"
@@ -15128,12 +15511,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"
@@ -15161,9 +15544,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Edukiera"
@@ -15185,10 +15565,29 @@ 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 "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"
@@ -15338,6 +15737,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr "Tentsioa"
+
msgid "Amperage"
msgstr ""
@@ -15359,6 +15761,12 @@ msgstr "Konponketa"
msgid "Edit Car Repair"
msgstr "Autoen konponketa editatu"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15386,6 +15794,12 @@ msgstr "Alokairua"
msgid "Edit Car Rental"
msgstr "Alokairuko autoa editatu"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "Partekatzea"
@@ -15410,22 +15824,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 ""
@@ -15447,9 +15845,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Arropak"
@@ -15644,6 +16039,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15674,6 +16072,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Jarlekua"
@@ -15686,9 +16087,6 @@ msgstr "Gurpildun aulkia"
msgid "limited"
msgstr "mugatua"
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15698,8 +16096,13 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
-msgstr ""
+msgstr "Estazioa"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Estazioa editatu"
msgid "Building"
msgstr "Eraikina"
@@ -15713,6 +16116,9 @@ msgstr "Metroaren sarrera editatu"
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15737,14 +16143,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"
@@ -15793,8 +16191,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"
@@ -15847,6 +16245,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 ""
@@ -15869,21 +16282,6 @@ msgstr "Hotela editatu"
msgid "Stars"
msgstr "Izarrak"
-msgid "Internet access"
-msgstr ""
-
-msgid "wlan"
-msgstr ""
-
-msgid "wired"
-msgstr ""
-
-msgid "terminal"
-msgstr "terminala"
-
-msgid "Internet access fee"
-msgstr ""
-
msgid "Smoking"
msgstr ""
@@ -16073,9 +16471,6 @@ msgstr ""
msgid "Edit Stripclub"
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 "Tourism"
msgstr "Turismoa"
@@ -16097,9 +16492,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"
@@ -16112,6 +16513,9 @@ msgstr "kalea"
msgid "scheme"
msgstr "eskema"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Erakutsitako ingurua"
@@ -16151,6 +16555,9 @@ msgstr "... beste garraio mota batzuk aukeran"
msgid "Information Board"
msgstr "Informazio-panela"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Iragarki-taula"
@@ -16172,23 +16579,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"
@@ -16317,50 +16736,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"
@@ -16377,6 +16790,12 @@ msgstr "katoliko"
msgid "evangelical"
msgstr "ebanjeliko"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "Jehovaren lekukoak"
@@ -16389,6 +16808,9 @@ msgstr "metodista"
msgid "mormon"
msgstr "mormoi"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ortodoxo"
@@ -16407,74 +16829,174 @@ msgstr "kuakero"
msgid "roman_catholic"
msgstr ""
-msgid "shia"
-msgstr "xii"
+msgid "russian_orthodox"
+msgstr ""
-msgid "sunni"
-msgstr "suni"
+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 "Eraikin-publikoa"
+msgid "Edit Mosque"
+msgstr ""
-msgid "Edit Public Building"
-msgstr "Eraikin-publikoa editatu"
+msgid "mosque"
+msgstr ""
-msgid "Town hall"
-msgstr "Udaletxea"
+msgid "ibadi"
+msgstr ""
-msgid "Edit Town hall"
-msgstr "Udaletxea editatu"
+msgid "shia"
+msgstr "xii"
-msgid "Community Centre"
+msgid "sunni"
+msgstr "suni"
+
+msgid "Synagogue"
msgstr ""
-msgid "Embassy"
-msgstr "Enbaxada"
+msgid "Edit Synagogue"
+msgstr ""
-msgid "Edit Embassy"
-msgstr "Enbaxada editatu"
+msgid "synagogue"
+msgstr ""
-msgid "Courthouse"
-msgstr "Epaitegia"
+msgid "conservative"
+msgstr ""
-msgid "Edit Courthouse"
-msgstr "Epaitegia editatu"
+msgid "reform"
+msgstr ""
-msgid "Prison"
-msgstr "Gartzela"
+msgid "Buddhist Temple"
+msgstr ""
-msgid "Edit Prison"
-msgstr "Gartzela editatu"
+msgid "Edit Buddhist Temple"
+msgstr ""
-msgid "Police"
-msgstr "Polizia"
+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 "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"
+
+msgid "Edit Public Building"
+msgstr "Eraikin-publikoa editatu"
+
+msgid "Town hall"
+msgstr "Udaletxea"
+
+msgid "Edit Town hall"
+msgstr "Udaletxea editatu"
+
+msgid "Community Centre"
+msgstr ""
+
+msgid "Embassy"
+msgstr "Enbaxada"
+
+msgid "Edit Embassy"
+msgstr "Enbaxada editatu"
+
+msgid "Courthouse"
+msgstr "Epaitegia"
+
+msgid "Edit Courthouse"
+msgstr "Epaitegia editatu"
+
+msgid "Prison"
+msgstr "Gartzela"
+
+msgid "Edit Prison"
+msgstr "Gartzela editatu"
+
+msgid "Police"
+msgstr "Polizia"
msgid "Edit Police"
msgstr "Polizia editatu"
@@ -16527,6 +17049,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"
@@ -16608,12 +17136,66 @@ msgstr "Albaitaria"
msgid "Edit Veterinary"
msgstr "Albaitaria editatu"
-msgid "Drinking water"
+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"
@@ -16623,6 +17205,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 ""
@@ -16632,31 +17238,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 ""
@@ -16684,8 +17296,8 @@ msgstr ""
msgid "Recycling"
msgstr "Birziklapena"
-msgid "Edit Recycling station"
-msgstr "Birziklatze-gunea editatu"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Bateria"
@@ -16711,21 +17323,15 @@ 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 "plastic"
-msgstr "plastikoa"
-
msgid "Amount of Seats"
msgstr "Jarleku kopurua"
@@ -16760,8 +17366,17 @@ msgstr "Ehiza-postua editatu"
msgid "Height"
msgstr "Garaiera"
+msgctxt "height"
msgid "low"
-msgstr "baxua"
+msgstr ""
+
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
msgid "Hide"
msgstr "Ezkutatu"
@@ -16769,9 +17384,6 @@ msgstr "Ezkutatu"
msgid "Lock"
msgstr "Esklusa"
-msgid "Drinking Water"
-msgstr "Iturria (edateko ona)"
-
msgid "Edit Source of Potable Water"
msgstr ""
@@ -16803,6 +17415,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16840,119 +17455,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"
@@ -16984,26 +17635,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 ""
@@ -17011,6 +17663,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "zelaia"
+
+msgid "sports_centre"
+msgstr "kiroldegia"
+
+msgid "stadium"
+msgstr "estadioa"
+
msgid "10pin"
msgstr "Bola-jokoa"
@@ -17044,6 +17705,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"
@@ -17100,7 +17777,7 @@ msgid "Skating"
msgstr "Patinajea"
msgid "Edit Skating"
-msgstr "Patinajea editatu"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -17144,36 +17821,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 ""
@@ -17216,19 +17911,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 ""
@@ -17367,72 +18058,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 "RC Car"
+msgstr ""
+
+msgid "Edit RC Car"
+msgstr ""
+
+msgid "Man Made"
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"
@@ -17657,41 +18434,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"
@@ -17700,8 +18503,8 @@ msgstr "Erpin geodesikoa"
msgid "Edit Survey Point"
msgstr "Erpin geodesikoa"
-msgid "Surveillance"
-msgstr "Zaintza-kamera"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Zaintza-kamera editatu"
@@ -17712,12 +18515,102 @@ msgstr "barruko"
msgid "outdoor"
msgstr "kanpoko"
-msgid "public"
-msgstr "publikoa"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "denda"
+
+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 "Energia-sorgailua"
@@ -17769,89 +18662,192 @@ 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 "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 "fotovoltaiko"
-
-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"
-msgstr "Zentral elektrikoa"
+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 "Edit Power Station"
-msgstr "Zentral elektrikoa editatu"
+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"
@@ -17862,6 +18858,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 ""
@@ -17877,6 +18888,9 @@ msgstr "Elektrizitate-dorrea editatu"
msgid "Tower reference"
msgstr "Dorrearen erreferentzia"
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17895,11 +18909,9 @@ msgstr "Linea elektrikoa editatu"
msgid "Line type"
msgstr "Linea mota"
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -18008,11 +19020,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"
@@ -18023,7 +19035,7 @@ msgstr "Harategia editatu"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -18044,6 +19056,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr "Produktu organikoen denda"
+
msgid "Greengrocer"
msgstr ""
@@ -18056,9 +19071,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr "Produktu organikoen denda"
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -18128,7 +19140,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -18149,13 +19161,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"
@@ -18164,9 +19176,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"
@@ -18192,6 +19203,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 ""
@@ -18225,13 +19242,34 @@ msgstr "Optika editatu"
msgid "Jewelry"
msgstr ""
-msgid "Edit Jewelry"
-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"
@@ -18261,7 +19299,7 @@ msgstr "Burdindegia editatu"
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18273,19 +19311,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"
@@ -18321,7 +19359,7 @@ msgstr "Bidaia-agentzia editatu"
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18534,6 +19572,12 @@ msgstr "Mendi-tontorra"
msgid "Edit Peak"
msgstr "Mendi-tontorra editatu"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Glaziarra"
@@ -18573,26 +19617,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"
@@ -18600,15 +19653,6 @@ msgstr "Basoa"
msgid "Edit Forest Landuse"
msgstr "Basoa editatu"
-msgid "coniferous"
-msgstr "konifero"
-
-msgid "deciduous"
-msgstr "hostoerorkorra"
-
-msgid "mixed"
-msgstr "misto"
-
msgid "Grassland"
msgstr ""
@@ -18684,6 +19728,12 @@ msgstr "Belardia"
msgid "Edit Meadow Landuse"
msgstr "Belardia editatu"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Mahastia"
@@ -18738,8 +19788,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"
@@ -18750,6 +19800,9 @@ msgstr "Hilerria (txikia)"
msgid "Edit Graveyard"
msgstr "Hilerria (txikia) editatu"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Hilerria"
@@ -18825,6 +19878,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"
@@ -18861,6 +19941,18 @@ msgstr "bikoitia"
msgid "alphabetic"
msgstr "alfabetiko"
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -19029,20 +20121,49 @@ msgstr ""
msgid "Edit general route"
msgstr ""
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+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"
@@ -19089,19 +20210,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"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -19125,7 +20249,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -19221,18 +20345,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"
@@ -19242,8 +20375,11 @@ msgstr "oztopoa"
msgid "motorroad"
msgstr "autobidea"
-msgid "highway_track"
-msgstr "pista"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "zerbitzu-bidea"
@@ -19251,11 +20387,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"
@@ -19272,6 +20408,9 @@ msgstr "ur-lasterrak"
msgid "railwaypoint"
msgstr "trenbide-puntua"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19287,29 +20426,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"
@@ -19329,20 +20468,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"
@@ -19416,11 +20555,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 ""
@@ -19434,9 +20576,6 @@ msgstr "Herria"
msgid "One Way"
msgstr "Norabide bakarra"
-msgid "Church"
-msgstr "Eliza"
-
msgid "Fuel Station"
msgstr "Gasolindegia"
@@ -19464,6 +20603,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19509,10 +20651,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"
@@ -19524,7 +20696,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"
@@ -19542,7 +20714,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19659,19 +20831,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 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"
@@ -19683,14 +20966,53 @@ msgstr ""
msgid "unknown muslim denomination"
msgstr ""
-msgid "unknown jewish denomination"
+msgid "unknown jewish denomination"
+msgstr ""
+
+msgid ""
+"no wikipedia-language given, use ''wikipedia''=''language:page title''"
+msgstr ""
+
+msgid "unknown language prefix in wikipedia tag"
+msgstr ""
+
+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 ""
-"no wikipedia-language given, use ''wikipedia''=''language:page title''"
+msgid "unusual train track gauge; use mm with no separator"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unusual incline; use percentages/degrees or up/down"
msgstr ""
msgid "Landsat"
@@ -19702,19 +21024,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 "skobbler heatmap"
@@ -19735,7 +21066,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19744,6 +21075,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19890,6 +21224,29 @@ 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 ""
@@ -20055,6 +21412,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -20100,6 +21460,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -20301,6 +21694,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 ""
@@ -20322,13 +21727,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20591,10 +21990,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20798,7 +22200,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"
@@ -21069,15 +22471,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -21248,6 +22641,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 ""
@@ -21266,12 +22662,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21407,6 +22797,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 ""
@@ -21424,6 +22817,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 ""
@@ -21650,7 +23046,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."
@@ -21700,7 +23099,7 @@ msgstr ""
msgid "Color Schemes"
msgstr "Kolore-eskemak"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21924,27 +23323,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 ""
@@ -23022,9 +24403,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 ""
@@ -23671,9 +25074,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23726,18 +25126,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 ""
@@ -24084,6 +25472,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -24235,6 +25644,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 ""
@@ -24552,9 +25964,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24770,6 +26179,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 ""
@@ -24802,15 +26214,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 ""
@@ -24925,9 +26353,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -25106,19 +26531,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"
@@ -25334,6 +26759,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 ""
@@ -25370,6 +26884,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..."
@@ -25522,9 +27039,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26510,9 +28024,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr "Bideoa"
-
msgid "Import Video"
msgstr "Bideoa inportatu"
@@ -26799,9 +28310,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 14733a5..f9b9547 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-08-04 03:41+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-08-05 04:55+0000\n"
-"X-Generator: Launchpad (build 16718)\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,20 +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 ""
+msgstr "هشدار: {0}"
msgid "INFO: {0}"
-msgstr ""
+msgstr "اطلاعات: {0}"
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 ""
@@ -250,9 +256,6 @@ msgstr "ابزار: {0}"
msgid "Please select at least four nodes."
msgstr "حداقل چهار نقطه را انتخاب کنید."
-msgid "Information"
-msgstr "اطلاعات"
-
msgid "Align Nodes in Line"
msgstr ""
@@ -289,6 +292,9 @@ msgstr "بعدی"
msgid "Nothing selected to zoom to."
msgstr "چیزی برای بزرگنمایی انتخاب نشده است."
+msgid "Information"
+msgstr "اطلاعات"
+
msgid "Zoom to {0}"
msgstr "بزرگنمایی {0}"
@@ -345,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} مسیر را ترکیب کن"
@@ -526,6 +531,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "تاريخكم اطلاعات مسير، نقاط يا روابط OSM را نشان بده."
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -639,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 ""
@@ -789,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"
@@ -975,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 ""
@@ -998,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>"
@@ -1166,9 +1167,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1307,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"
@@ -1402,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 ""
@@ -1686,6 +1705,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1905,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] ""
@@ -2331,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 ""
@@ -2527,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 ""
@@ -2614,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 ""
@@ -2650,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"
@@ -2676,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}''"
@@ -2781,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] ""
@@ -2841,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"
@@ -2872,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"
@@ -2896,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 ""
@@ -2926,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 ""
@@ -2946,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 ""
@@ -2955,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 ""
@@ -2975,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}"
@@ -3006,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}''."
@@ -3161,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 ""
@@ -3269,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 ""
@@ -3307,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3348,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3372,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 ""
@@ -3431,6 +3469,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3513,6 +3554,15 @@ 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 ""
@@ -3582,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 ""
@@ -3639,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})"
@@ -3677,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}"
@@ -3814,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"
@@ -3889,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 ""
@@ -3919,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3946,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''"
@@ -4012,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 ""
@@ -4132,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"
@@ -4361,6 +4400,18 @@ 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 ""
@@ -4465,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 ""
@@ -4765,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"
@@ -4802,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"
@@ -4854,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 ""
@@ -5111,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 ""
@@ -5639,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5722,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 ""
@@ -5812,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 ""
@@ -5983,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 ""
@@ -6270,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"
@@ -6336,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 "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"
@@ -6378,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)"
@@ -6538,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"
@@ -6856,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 ""
@@ -6987,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, "
@@ -7011,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 ""
@@ -7124,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."
@@ -7223,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7310,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"
@@ -7329,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 ""
@@ -7395,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"
@@ -7471,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 ""
@@ -7486,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"
@@ -7702,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 "
@@ -7716,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 ""
@@ -7731,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 ""
@@ -7738,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 ..."
@@ -7851,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] ""
@@ -7863,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>"
@@ -7879,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:"
@@ -8025,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8055,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"
@@ -8408,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8429,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 ""
@@ -8486,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8552,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 ""
@@ -8735,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}''..."
@@ -8757,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"
@@ -8767,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:"
@@ -8988,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}''"
@@ -9703,6 +9811,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9771,6 +9912,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9824,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 ""
@@ -10280,6 +10429,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 ""
@@ -10343,7 +10498,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 ""
@@ -10601,40 +10756,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}''"
@@ -10687,8 +10842,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:"
@@ -10697,20 +10852,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 ""
@@ -10792,14 +10952,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"
@@ -10872,7 +11026,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10951,9 +11105,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10972,6 +11123,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 ""
@@ -11001,9 +11160,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 ""
@@ -11034,7 +11233,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 ""
@@ -11074,28 +11273,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..."
@@ -11190,6 +11387,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11205,12 +11405,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}."
@@ -11289,7 +11497,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11388,35 +11596,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 ""
@@ -11426,8 +11610,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 ..."
@@ -11454,10 +11638,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>"
@@ -11541,8 +11722,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,7 +11920,7 @@ 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}"
@@ -11785,6 +11966,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."
@@ -11815,19 +12005,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 ""
@@ -11849,11 +12039,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 ""
@@ -11923,13 +12125,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}''"
@@ -12072,10 +12274,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"
@@ -12090,22 +12292,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}''"
@@ -12174,8 +12375,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..."
@@ -12190,9 +12390,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}''"
@@ -12514,12 +12729,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12530,27 +12744,70 @@ 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 "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] ""
+
+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"
@@ -12564,9 +12821,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."
@@ -12889,6 +13160,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 ""
@@ -13128,6 +13404,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."
@@ -13177,9 +13456,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 ""
@@ -13216,6 +13492,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 ""
@@ -13346,6 +13627,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13436,6 +13720,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 ""
@@ -13454,10 +13782,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13469,6 +13797,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13496,18 +13827,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 ""
@@ -13517,9 +13842,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13529,13 +13851,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13583,6 +13905,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13667,6 +13992,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13771,21 +14099,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 ""
@@ -13801,10 +14138,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"
@@ -13840,7 +14177,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13909,12 +14246,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 ""
@@ -13930,15 +14273,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 ""
@@ -13960,6 +14294,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13969,6 +14312,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13978,10 +14324,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14014,9 +14357,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14059,6 +14399,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14074,6 +14420,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14143,19 +14492,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14186,6 +14529,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14195,10 +14539,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14252,12 +14596,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14318,12 +14656,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14363,9 +14710,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14399,6 +14743,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 ""
@@ -14480,18 +14839,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 ""
@@ -14567,7 +14931,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14591,10 +14955,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"
@@ -14606,9 +14973,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14660,6 +15024,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14672,6 +15039,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14783,11 +15185,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14799,11 +15199,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14822,10 +15220,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14855,9 +15253,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14879,10 +15274,29 @@ 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"
@@ -15032,6 +15446,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15053,7 +15470,13 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
-msgid "Tyres"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
+msgid "Tyres"
msgstr ""
msgid "Edit Tyres"
@@ -15080,6 +15503,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15104,22 +15533,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 ""
@@ -15141,9 +15554,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15338,6 +15748,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15368,6 +15781,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15380,9 +15796,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15392,9 +15805,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15407,6 +15825,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15431,14 +15852,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15487,7 +15900,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15541,41 +15954,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"
@@ -15767,9 +16180,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15791,9 +16201,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15806,6 +16222,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15845,6 +16264,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15866,22 +16288,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"
@@ -16011,49 +16445,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"
@@ -16071,6 +16499,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16083,6 +16517,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16101,37 +16538,137 @@ 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"
@@ -16221,6 +16758,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 ""
@@ -16302,125 +16845,203 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
msgstr ""
msgid "Edit Shelter"
@@ -16454,16 +17075,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16497,6 +17124,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16534,117 +17164,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 ""
@@ -16678,33 +17344,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 ""
@@ -16738,6 +17414,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 ""
@@ -16838,36 +17530,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 ""
@@ -16910,19 +17620,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 ""
@@ -17061,6 +17767,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 ""
@@ -17073,60 +17791,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 ""
@@ -17351,41 +18143,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"
@@ -17394,7 +18212,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17406,12 +18224,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 ""
@@ -17463,88 +18371,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17556,6 +18567,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 ""
@@ -17571,6 +18597,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17589,11 +18618,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17702,10 +18729,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17717,7 +18744,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17738,6 +18765,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17750,9 +18780,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17822,7 +18849,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17843,13 +18870,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"
@@ -17858,7 +18885,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17886,6 +18912,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17922,10 +18954,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"
@@ -17955,7 +19008,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17967,19 +19020,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"
@@ -18015,7 +19068,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18228,6 +19281,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18267,24 +19326,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 ""
@@ -18294,15 +19362,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18378,6 +19437,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18432,7 +19497,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18444,6 +19509,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18480,43 +19548,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18555,6 +19650,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18723,21 +19830,50 @@ 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 ""
+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 ""
@@ -18783,19 +19919,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"
@@ -18819,7 +19958,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18915,18 +20054,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 ""
@@ -18936,7 +20084,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18945,10 +20096,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18966,6 +20117,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18981,28 +20135,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"
@@ -19023,19 +20177,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"
@@ -19110,10 +20264,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19128,9 +20285,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19158,6 +20312,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19203,10 +20360,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"
@@ -19218,7 +20405,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"
@@ -19236,7 +20423,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19353,19 +20540,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 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"
@@ -19384,7 +20682,46 @@ 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 "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 "Landsat"
@@ -19396,19 +20733,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 "skobbler heatmap"
@@ -19429,7 +20775,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19438,6 +20784,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19584,6 +20933,29 @@ 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 ""
@@ -19749,6 +21121,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19794,6 +21169,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19980,19 +21388,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20016,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}''."
@@ -20285,10 +21699,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20492,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"
@@ -20763,15 +22180,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20942,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 ""
@@ -20960,12 +22371,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21101,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 ""
@@ -21118,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 ""
@@ -21344,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."
@@ -21394,7 +22808,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21579,6 +22993,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21618,27 +23097,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 ""
@@ -22716,9 +24177,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 ""
@@ -23365,9 +24843,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23420,18 +24895,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 ""
@@ -23778,6 +25241,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23929,6 +25413,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 ""
@@ -24246,9 +25733,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24464,6 +25948,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 ""
@@ -24496,15 +25983,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 ""
@@ -24619,9 +26122,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24800,19 +26300,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"
@@ -25028,6 +26528,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 ""
@@ -25064,6 +26653,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..."
@@ -25216,9 +26808,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26204,9 +27793,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26485,9 +28071,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 eaf6081..dcacf65 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-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-04-23 20:32+0000\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-08-05 04:41+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ 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 ""
@@ -60,6 +63,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Alustetaan käyttöjärjestelmäyhteys"
@@ -163,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 "
@@ -264,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"
@@ -303,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}"
@@ -358,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"
@@ -420,10 +418,12 @@ msgid "Delete selected objects."
msgstr "Poista valitut objektit."
msgid "Toggle dialogs panel"
-msgstr ""
+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"
@@ -545,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)"
@@ -667,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"
@@ -827,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"
@@ -1032,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 "
@@ -1060,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>"
@@ -1243,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"
@@ -1395,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"
@@ -1507,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"
@@ -1801,6 +1805,9 @@ 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ä)"
@@ -2039,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"
@@ -2525,6 +2532,9 @@ 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"
msgstr ""
@@ -2733,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 "
@@ -2830,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}"
@@ -2866,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"
@@ -2894,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}"
@@ -3013,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ä"
@@ -3073,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"
@@ -3106,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"
@@ -3133,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}"
@@ -3163,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 "
@@ -3188,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 "
@@ -3201,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 "
@@ -3227,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}"
@@ -3260,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"
@@ -3432,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."
@@ -3547,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 ""
@@ -3585,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"
@@ -3629,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"
@@ -3653,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ä"
@@ -3714,6 +3720,9 @@ 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"
@@ -3798,6 +3807,15 @@ 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"
@@ -3875,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"
@@ -3932,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})"
@@ -3973,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}"
@@ -4119,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"
@@ -4198,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}"
@@ -4228,9 +4255,6 @@ msgstr "rakennus"
msgid "area"
msgstr "alue"
-msgid "Unclosed way"
-msgstr "Sulkematon alue"
-
msgid "Unconnected ways"
msgstr "Puuttuva yhteys polun päästä"
@@ -4255,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''"
@@ -4323,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)"
@@ -4447,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"
@@ -4685,6 +4688,18 @@ 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 "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"
@@ -4793,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)"
@@ -5111,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."
@@ -5118,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."
@@ -5125,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."
@@ -5140,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"
@@ -5156,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"
@@ -5212,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"
@@ -5481,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 "
@@ -6077,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"
@@ -6160,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"
@@ -6252,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 "
@@ -6432,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"
@@ -6752,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 ""
@@ -6824,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"
@@ -6866,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)"
@@ -7033,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"
@@ -7383,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"
@@ -7530,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, "
@@ -7556,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"
@@ -7690,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ä."
@@ -7797,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"
@@ -7907,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"
@@ -7926,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:"
@@ -7995,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"
@@ -8075,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 ""
@@ -8090,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"
@@ -8322,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 "
@@ -8336,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 ""
@@ -8351,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"
@@ -8358,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 ..."
@@ -8489,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..."
@@ -8501,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>"
@@ -8521,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:"
@@ -8671,7 +8738,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8701,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"
@@ -9066,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..."
@@ -9087,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"
@@ -9144,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ä"
@@ -9216,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 ""
@@ -9399,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}''..."
@@ -9421,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"
@@ -9431,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:"
@@ -9652,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}''"
@@ -10377,6 +10442,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -10445,6 +10543,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"
@@ -10505,6 +10606,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"
@@ -10738,6 +10844,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"
@@ -10988,6 +11096,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"
@@ -11053,8 +11167,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"
@@ -11315,21 +11429,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"
@@ -11351,6 +11450,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 ""
@@ -11401,8 +11515,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:"
@@ -11411,20 +11525,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 "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 ""
@@ -11509,16 +11628,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 ""
@@ -11589,8 +11702,8 @@ msgstr "Aseta esivalinnan tagit"
msgid "New relation"
msgstr ""
-msgid "Change Properties"
-msgstr "Muuta ominaisuuksia"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -11668,9 +11781,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr "Tagien esiasetuslähdettä ei voitu lukea: {0}"
-
msgid "Error parsing {0}: "
msgstr "Virhe käsiteltäessä {0}: "
@@ -11689,6 +11799,16 @@ msgstr "Näytä vain nykyiseen valintaan sopivat vaihtoehdot"
msgid "Search in tags"
msgstr "Etsi myös esivalinnoissa käytetyistä tageista"
+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 ""
@@ -11720,9 +11840,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 ""
@@ -11755,7 +11917,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 ""
@@ -11797,28 +11959,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..."
@@ -11917,6 +12077,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 ""
@@ -11932,12 +12095,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}."
@@ -12018,8 +12189,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"
@@ -12118,37 +12289,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 ""
@@ -12158,8 +12303,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 ..."
@@ -12186,13 +12331,10 @@ 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}''."
+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 ""
@@ -12277,8 +12419,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}."
@@ -12481,7 +12623,7 @@ 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}"
@@ -12527,6 +12669,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."
@@ -12557,19 +12708,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 ""
@@ -12591,11 +12742,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 ""
@@ -12665,18 +12828,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 ""
@@ -12825,10 +12984,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"
@@ -12843,24 +13002,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}''"
@@ -12935,10 +13091,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..."
@@ -12952,9 +13106,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}''"
@@ -13299,12 +13468,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -13315,9 +13483,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 ""
@@ -13351,9 +13562,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."
@@ -13678,6 +13903,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 ""
@@ -13935,6 +14165,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."
@@ -13984,9 +14217,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 ""
@@ -14023,6 +14253,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 ""
@@ -14156,6 +14391,9 @@ msgstr "Penger"
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "Tietulli"
+
msgid "Motorway Link"
msgstr "Moottoritien ramppi"
@@ -14246,6 +14484,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"
@@ -14264,10 +14546,10 @@ msgstr "Alue"
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -14279,6 +14561,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Pysäköintialueen ajoväylä"
@@ -14306,18 +14591,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"
@@ -14327,9 +14606,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr "määränpää"
-
msgid "delivery"
msgstr ""
@@ -14339,15 +14615,15 @@ msgstr ""
msgid "private"
msgstr "yksityinen"
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr ""
msgid "forestry"
msgstr ""
-msgid "no"
-msgstr "ei"
-
msgid "official"
msgstr ""
@@ -14393,6 +14669,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr "Julkinen liikenne (psv)"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Miniminopeus (km/h)"
@@ -14477,6 +14756,9 @@ msgstr "Muokkaa sillan ominaisuuksia"
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -14581,21 +14863,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 ""
@@ -14611,11 +14902,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"
@@ -14650,8 +14941,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"
@@ -14719,12 +15010,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"
@@ -14740,15 +15037,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)"
@@ -14770,6 +15058,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 ""
@@ -14779,6 +15076,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -14788,10 +15088,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"
@@ -14824,9 +15121,6 @@ msgstr ""
msgid "Passing Place"
msgstr "Kohtaamispaikka"
-msgid "Edit Passing Place"
-msgstr "Muokkaa kohtaamispaikkaa"
-
msgid "Turning Circle"
msgstr "Kääntöympyrä"
@@ -14869,6 +15163,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr "Sallitut kulkumuodot:"
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr "Sulkutolppa"
@@ -14884,6 +15184,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14953,19 +15256,16 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
-msgstr ""
-
-msgid "split_rail"
+msgid "pole"
msgstr ""
-msgid "chain"
+msgid "Guard Rail"
msgstr ""
-msgid "hedge"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14996,6 +15296,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -15005,10 +15306,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -15062,6 +15363,18 @@ msgstr ""
msgid "stepover"
msgstr ""
+msgid "Turnstile"
+msgstr "Pyöröportti"
+
+msgid "Edit Turnstile"
+msgstr "Muokkaa pyöröporttia"
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Material"
msgstr ""
@@ -15128,12 +15441,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Kanava"
@@ -15173,9 +15495,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -15209,6 +15528,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"
@@ -15290,18 +15624,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 ""
@@ -15377,7 +15716,7 @@ msgstr "turismi"
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -15401,10 +15740,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
-msgstr "Jännite"
+msgid "Voltage in Volts (V)"
+msgstr ""
-msgid "Frequency (Hz)"
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
+
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -15416,9 +15758,6 @@ msgstr "Kapean raideleveyden rata"
msgid "Edit Narrow Gauge Rail"
msgstr "Muokkaa kapean raideleveyden rataa"
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr "Yksiraiteinen rautatie"
@@ -15470,6 +15809,9 @@ msgstr ""
msgid "Level Crossing"
msgstr "Tasoristeys"
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -15482,18 +15824,32 @@ 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 "täysi"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "double_half"
msgstr ""
msgid "Crossing"
msgstr "Risteys"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Risteystyyppi"
@@ -15593,11 +15949,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -15609,11 +15963,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -15632,12 +15984,12 @@ msgstr ""
msgid "underground"
msgstr "maanalainen"
+msgid "rooftop"
+msgstr ""
+
msgid "Access"
msgstr "Pääsy (access)"
-msgid "customers"
-msgstr ""
-
msgid "Park and Ride"
msgstr ""
@@ -15665,9 +16017,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Paikkoja"
@@ -15689,10 +16038,29 @@ 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 "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"
@@ -15842,6 +16210,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr "Jännite"
+
msgid "Amperage"
msgstr ""
@@ -15863,6 +16234,12 @@ msgstr "Korjaamo"
msgid "Edit Car Repair"
msgstr "Muokkaa autokorjaamon ominaisuuksia"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15890,6 +16267,12 @@ msgstr "Vuokraamo"
msgid "Edit Car Rental"
msgstr "Muokkaa autovuokraamon ominaisuuksia"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15914,22 +16297,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 ""
@@ -15951,9 +16318,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Vaatteet"
@@ -16148,6 +16512,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -16178,6 +16545,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Penkki"
@@ -16190,9 +16560,6 @@ msgstr "Pyörätuoli"
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -16202,9 +16569,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr "Rakennus"
@@ -16217,6 +16589,9 @@ msgstr "Muokkaa sisäänkäynnin ominaisuuksia"
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -16241,14 +16616,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -16297,8 +16664,8 @@ msgstr ""
msgid "Taxi"
msgstr "Taksi"
-msgid "Edit Taxi station"
-msgstr "Muokkaa taksitolppaa"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Lentokenttä"
@@ -16351,6 +16718,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 ""
@@ -16373,21 +16755,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 ""
@@ -16577,9 +16944,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr "Turismi"
@@ -16601,9 +16965,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"
@@ -16616,6 +16986,9 @@ msgstr "katu"
msgid "scheme"
msgstr "kaavio"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Kartan laajuus"
@@ -16655,6 +17028,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -16676,22 +17052,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"
@@ -16821,49 +17209,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"
@@ -16881,6 +17263,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16893,6 +17281,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16911,37 +17302,137 @@ 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"
@@ -17031,6 +17522,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"
@@ -17112,55 +17609,139 @@ msgstr "Eläinlääkäri"
msgid "Edit Veterinary"
msgstr "Muokkaa eläinlääkärin ominaisuuksia"
-msgid "Drinking water"
+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 ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
+msgstr ""
+
+msgid "Post Box"
+msgstr "Postilaatikko"
+
+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 "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 "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 ""
-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 ""
@@ -17188,8 +17769,8 @@ msgstr ""
msgid "Recycling"
msgstr "Kierrätys"
-msgid "Edit Recycling station"
-msgstr "Muokkaa kierrätyspisteen ominaisuuksia"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Paristot"
@@ -17215,21 +17796,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 "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -17264,18 +17839,24 @@ msgstr "Muokkaa metsästyslavan ominaisuuksia"
msgid "Height"
msgstr "Korkeus"
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
+
msgid "Hide"
msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
-msgstr "Juomavesi"
-
msgid "Edit Source of Potable Water"
msgstr ""
@@ -17307,6 +17888,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -17344,119 +17928,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"
@@ -17488,26 +18108,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 ""
@@ -17515,6 +18136,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "kenttä"
+
+msgid "sports_centre"
+msgstr "urheilukeskus"
+
+msgid "stadium"
+msgstr "stadion"
+
msgid "10pin"
msgstr ""
@@ -17548,6 +18178,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"
@@ -17604,7 +18250,7 @@ msgid "Skating"
msgstr "Luistelu"
msgid "Edit Skating"
-msgstr "Muokkaa luistelua"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -17648,36 +18294,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 ""
@@ -17720,19 +18384,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 ""
@@ -17871,6 +18531,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 ""
@@ -17883,60 +18555,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"
@@ -18161,41 +18907,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"
@@ -18204,8 +18976,8 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
-msgstr "Valvontakamera"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Muokkaa valvontakameran ominaisuuksia"
@@ -18216,12 +18988,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+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 ""
@@ -18273,88 +19135,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"
@@ -18366,6 +19331,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 ""
@@ -18381,6 +19361,9 @@ msgstr "Muokkaa korkeajännitelinjan tornin ominaisuuksia"
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -18399,11 +19382,9 @@ msgstr "Muokkaa sähkölinjan ominaisuuksia"
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -18512,11 +19493,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"
@@ -18527,7 +19508,7 @@ msgstr "Muokkaa lihakaupan ominaisuuksia"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -18548,6 +19529,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr "Luomukauppa"
+
msgid "Greengrocer"
msgstr ""
@@ -18560,9 +19544,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr "Luomukauppa"
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -18632,7 +19613,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -18653,13 +19634,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"
@@ -18668,7 +19649,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -18696,6 +19676,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 ""
@@ -18732,10 +19718,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"
@@ -18765,7 +19772,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18777,19 +19784,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"
@@ -18825,7 +19832,7 @@ msgstr "Muokkaa matkatoimistoa"
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -19038,6 +20045,12 @@ msgstr "Huippu"
msgid "Edit Peak"
msgstr "Muokkaa huipun ominaisuuksia"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Jäätikkö"
@@ -19077,26 +20090,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ä"
@@ -19104,15 +20126,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 ""
@@ -19188,6 +20201,12 @@ msgstr "Niitty"
msgid "Edit Meadow Landuse"
msgstr "Muokkaa niittyä"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Viinitarha"
@@ -19242,8 +20261,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"
@@ -19254,6 +20273,9 @@ msgstr "Hautausmaa (pieni)"
msgid "Edit Graveyard"
msgstr "Muokkaa pienen hautausmaan ominaisuuksia"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Hautausmaa"
@@ -19329,6 +20351,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"
@@ -19365,6 +20414,18 @@ msgstr "parillinen"
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -19533,21 +20594,50 @@ 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 "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 ""
@@ -19593,20 +20683,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 ""
-msgid "Edit associated street"
-msgstr "Muokkaa liittyvä katu -relaatiota"
+msgid "house"
+msgstr ""
msgid "Street"
msgstr "Katu"
@@ -19629,7 +20722,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -19725,18 +20818,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 ""
@@ -19746,7 +20848,10 @@ msgstr ""
msgid "motorroad"
msgstr "moottoriliikennetie"
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -19755,10 +20860,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -19776,6 +20881,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19791,28 +20899,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"
@@ -19833,20 +20941,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"
@@ -19920,10 +21028,13 @@ msgstr "reitti"
msgid "boundary"
msgstr "raja"
+msgid "sport"
+msgstr "urheilu"
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19938,9 +21049,6 @@ msgstr "Kunta/kaupunki"
msgid "One Way"
msgstr "Yksi Suunta"
-msgid "Church"
-msgstr "Kirkko"
-
msgid "Fuel Station"
msgstr "Huoltoasema"
@@ -19968,6 +21076,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -20013,10 +21124,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"
@@ -20028,7 +21169,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"
@@ -20046,7 +21187,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -20163,19 +21304,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 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"
@@ -20194,7 +21446,46 @@ 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 "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 "Landsat"
@@ -20206,19 +21497,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 "skobbler heatmap"
@@ -20239,7 +21539,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -20248,6 +21548,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -20367,31 +21670,54 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+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 "Hike & Bike"
+msgid "Stuttgart (Luftbild)"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Physical DE - Physische Karte (Naturräume)"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
msgstr ""
msgid "Imagerie Drone (Haiti)"
@@ -20559,6 +21885,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -20604,6 +21933,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr "Portti:"
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr "Asetukset"
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -20805,6 +22167,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 ""
@@ -20826,13 +22200,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -21097,10 +22465,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -21304,7 +22675,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"
@@ -21579,15 +22950,6 @@ msgstr ""
msgid "Street Name:"
msgstr "Kadunnimi:"
-msgid "Increment"
-msgstr "Numeroväli"
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -21760,6 +23122,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 ""
@@ -21779,12 +23144,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21920,6 +23279,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 ""
@@ -21937,6 +23299,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 ""
@@ -22165,7 +23530,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."
@@ -22215,7 +23583,7 @@ msgstr "Poista valittu väriteema listasta."
msgid "Color Schemes"
msgstr "Väriteemat"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -22439,27 +23807,9 @@ 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"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -22906,23 +24256,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 ""
@@ -22943,7 +24295,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"
@@ -22963,7 +24315,7 @@ msgid "Created by {0} on {1}"
msgstr ""
msgid "Offset Information"
-msgstr ""
+msgstr "Siirroksen tarkemmat tiedot"
msgid "Report this offset"
msgstr ""
@@ -23002,18 +24354,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 "
@@ -23024,6 +24378,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 "
@@ -23031,6 +24387,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 "
@@ -23040,7 +24400,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 ""
@@ -23548,9 +24908,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 ""
@@ -23784,7 +25166,7 @@ msgid "License URL not available: {0}"
msgstr ""
msgid "OpenData preferences"
-msgstr ""
+msgstr "OpenData-liitännäisen asetukset"
msgid "License Agreement"
msgstr ""
@@ -24199,9 +25581,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 "Process queue"
msgstr ""
@@ -24257,18 +25636,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 ""
@@ -24617,6 +25984,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 "Haluatko tallentaa kuvatason {0} nykyisen kalibroinnin?"
@@ -24768,6 +26156,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"
@@ -25089,9 +26480,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -25307,6 +26695,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 ""
@@ -25339,15 +26730,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 ""
@@ -25462,9 +26869,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -25643,19 +27047,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"
@@ -25872,6 +27276,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 ""
@@ -25908,6 +27401,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..."
@@ -26064,9 +27561,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26741,6 +28235,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 "
@@ -26758,10 +28254,11 @@ msgid ""
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."
@@ -26794,12 +28291,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"
@@ -26882,7 +28381,7 @@ 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 "
@@ -27005,7 +28504,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ä"
@@ -27014,6 +28513,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 ""
@@ -27059,9 +28560,6 @@ msgstr "Poista pisteet valinnasta"
msgid "Removes all nodes from selection"
msgstr "Poistaa kaikki pisteet valinnasta"
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -27212,7 +28710,7 @@ 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 "
@@ -27278,19 +28776,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 ""
@@ -27351,9 +28853,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 d8a4352..2e48ab1 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-08-04 03:41+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-08-05 05:09+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 ""
@@ -250,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -289,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -343,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 ""
@@ -523,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -636,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 ""
@@ -786,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"
@@ -972,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 ""
@@ -995,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>"
@@ -1163,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1304,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"
@@ -1399,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 ""
@@ -1683,6 +1703,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1902,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] ""
@@ -2328,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 ""
@@ -2524,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 ""
@@ -2611,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 ""
@@ -2647,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"
@@ -2673,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}''"
@@ -2778,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] ""
@@ -2838,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"
@@ -2869,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"
@@ -2893,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 ""
@@ -2923,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 ""
@@ -2943,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 ""
@@ -2952,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 ""
@@ -2972,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}"
@@ -3003,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}''."
@@ -3160,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 ""
@@ -3268,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 ""
@@ -3306,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3347,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3371,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 ""
@@ -3430,6 +3469,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3512,6 +3554,15 @@ 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 ""
@@ -3581,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 ""
@@ -3638,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})"
@@ -3676,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}"
@@ -3813,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"
@@ -3888,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 ""
@@ -3918,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3945,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''"
@@ -4011,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 ""
@@ -4131,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"
@@ -4360,6 +4400,18 @@ 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 ""
@@ -4464,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 ""
@@ -4764,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"
@@ -4801,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"
@@ -4853,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 ""
@@ -5110,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 ""
@@ -5638,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5721,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 ""
@@ -5811,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 ""
@@ -5982,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 ""
@@ -6269,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"
@@ -6335,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"
@@ -6377,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)"
@@ -6537,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"
@@ -6855,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 ""
@@ -6986,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 ""
@@ -7010,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 ""
@@ -7123,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."
@@ -7222,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7309,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"
@@ -7328,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 ""
@@ -7394,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"
@@ -7470,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 ""
@@ -7485,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"
@@ -7701,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 "
@@ -7715,13 +7795,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7730,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 ""
@@ -7737,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 ..."
@@ -7850,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] ""
@@ -7862,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>"
@@ -7878,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:"
@@ -8024,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8054,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"
@@ -8407,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8428,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 ""
@@ -8485,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8551,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 ""
@@ -8734,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}''..."
@@ -8756,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"
@@ -8766,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:"
@@ -8987,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}''"
@@ -9702,6 +9811,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9770,6 +9912,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9823,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 ""
@@ -10279,6 +10429,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 ""
@@ -10342,7 +10498,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 ""
@@ -10600,40 +10756,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}''"
@@ -10686,8 +10842,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:"
@@ -10696,20 +10852,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 ""
@@ -10791,14 +10952,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,7 +11026,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10950,9 +11105,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10971,6 +11123,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 ""
@@ -11000,9 +11160,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 ""
@@ -11033,7 +11233,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 ""
@@ -11073,28 +11273,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..."
@@ -11189,6 +11387,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11204,12 +11405,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}."
@@ -11288,7 +11497,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11387,35 +11596,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 ""
@@ -11425,8 +11610,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 ..."
@@ -11453,10 +11638,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>"
@@ -11540,8 +11722,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}."
@@ -11738,7 +11920,7 @@ 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}"
@@ -11784,6 +11966,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."
@@ -11814,19 +12005,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 ""
@@ -11848,11 +12039,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 ""
@@ -11922,13 +12125,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}''"
@@ -12071,10 +12274,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"
@@ -12089,22 +12292,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}''"
@@ -12173,8 +12375,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..."
@@ -12189,9 +12390,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}''"
@@ -12513,12 +12729,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12529,30 +12744,73 @@ 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 "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] ""
+
+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"
@@ -12563,9 +12821,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."
@@ -12888,6 +13160,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 ""
@@ -13127,6 +13404,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."
@@ -13176,9 +13456,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 ""
@@ -13215,6 +13492,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 ""
@@ -13345,6 +13627,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13435,6 +13720,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 ""
@@ -13453,10 +13782,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 +13797,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13495,18 +13827,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 ""
@@ -13516,9 +13842,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13528,13 +13851,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13582,6 +13905,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13666,6 +13992,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13770,21 +14099,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 ""
@@ -13800,10 +14138,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"
@@ -13839,7 +14177,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13908,12 +14246,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 ""
@@ -13929,15 +14273,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 ""
@@ -13959,6 +14294,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13968,6 +14312,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13977,10 +14324,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14013,9 +14357,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14058,6 +14399,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14073,6 +14420,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14142,19 +14492,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14185,6 +14529,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14194,10 +14539,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14251,12 +14596,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14317,12 +14656,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14362,9 +14710,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14398,6 +14743,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 ""
@@ -14479,18 +14839,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 ""
@@ -14566,7 +14931,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14590,10 +14955,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"
@@ -14605,9 +14973,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14659,6 +15024,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14671,6 +15039,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14782,11 +15185,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14798,11 +15199,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14821,10 +15220,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14854,9 +15253,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14878,10 +15274,29 @@ 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"
@@ -15031,6 +15446,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15052,6 +15470,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15079,6 +15503,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15103,22 +15533,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 ""
@@ -15140,9 +15554,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15337,6 +15748,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15367,6 +15781,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15379,9 +15796,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15391,9 +15805,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15406,6 +15825,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15430,14 +15852,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15486,7 +15900,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15540,41 +15954,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"
@@ -15766,9 +16180,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15790,9 +16201,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15805,6 +16222,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15844,6 +16264,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15865,22 +16288,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"
@@ -16010,49 +16445,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"
@@ -16070,6 +16499,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16082,6 +16517,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16100,37 +16538,137 @@ 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"
@@ -16220,6 +16758,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 ""
@@ -16301,128 +16845,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16453,16 +17075,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16496,6 +17124,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16533,117 +17164,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 ""
@@ -16677,33 +17344,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 ""
@@ -16737,6 +17414,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 ""
@@ -16837,36 +17530,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 ""
@@ -16909,19 +17620,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 ""
@@ -17060,6 +17767,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 ""
@@ -17072,60 +17791,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 ""
@@ -17350,41 +18143,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"
@@ -17393,7 +18212,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17405,12 +18224,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 ""
@@ -17462,88 +18371,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17555,6 +18567,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 ""
@@ -17570,6 +18597,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17588,11 +18618,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17701,10 +18729,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17716,7 +18744,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17737,6 +18765,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17749,9 +18780,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17821,7 +18849,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17842,13 +18870,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"
@@ -17857,7 +18885,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17885,6 +18912,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17921,10 +18954,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"
@@ -17954,7 +19008,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17966,19 +19020,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"
@@ -18014,7 +19068,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18227,6 +19281,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18266,24 +19326,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 ""
@@ -18293,15 +19362,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18377,6 +19437,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18431,7 +19497,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18443,6 +19509,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18479,43 +19548,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18554,6 +19650,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18722,21 +19830,50 @@ 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 ""
+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 ""
@@ -18782,19 +19919,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"
@@ -18818,7 +19958,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18914,18 +20054,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 ""
@@ -18935,7 +20084,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18944,10 +20096,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18965,6 +20117,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18980,28 +20135,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"
@@ -19022,19 +20177,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"
@@ -19109,10 +20264,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19127,9 +20285,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19157,6 +20312,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19202,10 +20360,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"
@@ -19217,7 +20405,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"
@@ -19235,7 +20423,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19352,19 +20540,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 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"
@@ -19383,7 +20682,46 @@ 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 "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 "Landsat"
@@ -19395,19 +20733,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 "skobbler heatmap"
@@ -19428,7 +20775,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19437,6 +20784,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19583,6 +20933,29 @@ 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 ""
@@ -19748,6 +21121,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19793,6 +21169,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19979,19 +21388,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20015,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}''."
@@ -20284,10 +21699,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20491,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"
@@ -20762,15 +22180,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20941,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 ""
@@ -20959,12 +22371,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21100,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 ""
@@ -21117,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 ""
@@ -21343,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."
@@ -21393,7 +22808,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21578,6 +22993,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21617,27 +23097,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 ""
@@ -22715,9 +24177,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 ""
@@ -23364,9 +24843,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23419,18 +24895,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 ""
@@ -23777,6 +25241,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23928,6 +25413,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 ""
@@ -24245,9 +25733,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24463,6 +25948,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 ""
@@ -24495,15 +25983,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 ""
@@ -24618,9 +26122,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24799,19 +26300,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"
@@ -25027,6 +26528,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 ""
@@ -25063,6 +26653,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..."
@@ -25215,9 +26808,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26203,9 +27793,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26484,9 +28071,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 0d14e0b..3178974 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-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-08-15 12:23+0000\n"
-"Last-Translator: Nicolas Croiset <Unknown>\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-08-16 04:32+0000\n"
-"X-Generator: Launchpad (build 16723)\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,15 @@ 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}"
@@ -60,6 +63,9 @@ msgstr "INFO: {0}"
msgid "DEBUG: {0}"
msgstr "DEBUG: {0}"
+msgid "Cause: "
+msgstr "Cause : "
+
msgid "Executing platform startup hook"
msgstr "Initialisation spécifique à la plateforme"
@@ -166,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 "
@@ -266,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"
@@ -305,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}"
@@ -361,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"
@@ -549,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)"
@@ -676,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"
@@ -851,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"
@@ -1060,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 "
@@ -1090,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>"
@@ -1268,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"
@@ -1424,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"
@@ -1537,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"
@@ -1834,6 +1842,9 @@ 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)"
@@ -1973,7 +1984,7 @@ msgid "Finish drawing."
msgstr "Terminer le chemin."
msgid "FIX"
-msgstr ""
+msgstr "Correctif"
msgid "draw angle snap"
msgstr "tracer des angles discrets"
@@ -2082,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"
@@ -2558,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"
@@ -2772,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 "
@@ -2871,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}"
@@ -2907,11 +2921,11 @@ 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"
@@ -2935,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}''"
@@ -3058,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"
@@ -3126,11 +3143,9 @@ 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"
@@ -3159,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"
@@ -3187,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}"
@@ -3221,21 +3239,19 @@ msgstr ""
"Veuillez activer la fonction correspondante manuellement et recommencer "
"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 "
@@ -3245,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 "
@@ -3258,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 "
@@ -3287,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}"
@@ -3320,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}''"
@@ -3499,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."
@@ -3619,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)"
@@ -3664,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"
@@ -3709,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"
@@ -3734,6 +3738,15 @@ 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"
@@ -3795,6 +3808,9 @@ 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"
@@ -3877,6 +3893,15 @@ 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"
@@ -3950,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"
@@ -4011,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})"
@@ -4050,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}"
@@ -4198,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"
@@ -4277,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}"
@@ -4307,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"
@@ -4334,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 »"
@@ -4401,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"
@@ -4525,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"
@@ -4778,6 +4787,19 @@ 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)"
+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"
@@ -4884,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)"
@@ -5212,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."
@@ -5219,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."
@@ -5226,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."
@@ -5241,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"
@@ -5257,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"
@@ -5312,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"
@@ -5603,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 "
@@ -6194,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"
@@ -6277,6 +6292,36 @@ msgstr "Modèle actuellement actif ?"
msgid "No"
msgstr "Non"
+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 ""
+"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"
@@ -6367,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 "
@@ -6547,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"
@@ -6878,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 ""
@@ -6953,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"
@@ -6995,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)"
@@ -7164,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"
@@ -7515,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"
@@ -7660,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, "
@@ -7687,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"
@@ -7821,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."
@@ -7933,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"
@@ -8043,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"
@@ -8067,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 :"
@@ -8138,11 +8180,8 @@ 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"
@@ -8228,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 "
@@ -8250,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"
@@ -8514,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 "
@@ -8533,10 +8564,31 @@ msgstr ""
"modifications, vous rendrez ainsi la vie plus facile pour les autres "
"utilisateurs."
-msgid "Return to the previous dialog to enter a more descriptive comment"
-msgstr "Ajouter un commentaire"
+msgid "Please specify a changeset source"
+msgstr "Veuillez spécifier une source pour le groupe de modifications"
-msgid "Cancel and return to the previous dialog"
+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"
+
+msgid "Cancel and return to the previous dialog"
msgstr "Annuler et revenir à la fenêtre précédente"
msgid "Do not show this message again"
@@ -8548,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"
@@ -8555,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…"
@@ -8702,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…"
@@ -8714,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>"
@@ -8734,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 :"
@@ -8895,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"
@@ -8928,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"
@@ -9310,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…"
@@ -9332,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"
@@ -9391,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"
@@ -9473,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"
@@ -9678,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}''…"
@@ -9706,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"
@@ -9718,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 :"
@@ -9822,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."
@@ -9897,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é"
@@ -9989,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}''"
@@ -10792,7 +10849,7 @@ msgstr "Ajouter un paramètre"
msgid "Advanced Background: Changed"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid "Advanced Background: NonDefault"
msgstr ""
msgid "Current value is default."
@@ -10861,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"
@@ -10871,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"
@@ -10908,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 ""
@@ -10918,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"
@@ -11175,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"
@@ -11228,6 +11297,12 @@ 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 "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"
@@ -11283,7 +11358,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"
@@ -11404,6 +11479,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"
@@ -11471,8 +11552,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"
@@ -11754,21 +11835,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"
@@ -11790,6 +11856,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}''"
@@ -11854,8 +11935,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:"
@@ -11864,22 +11945,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 ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr "Fréquence de vérification des nouveaux messages"
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
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 store OAuth Access Token to credentials manager"
+msgstr ""
msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
@@ -11968,18 +12053,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 ""
@@ -12051,8 +12127,8 @@ msgstr "Appliquer les attributs"
msgid "New relation"
msgstr "Nouvelle relation"
-msgid "Change Properties"
-msgstr "Modifier les propriétés"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr "Prérequis inconnu : {0}"
@@ -12082,7 +12158,7 @@ msgid "Select auto-increment of {0} for this field"
msgstr ""
msgid "Cancel auto-increment for this field"
-msgstr "Annuler l'auto-incrément pour ce champ"
+msgstr "Annuler l''auto-incrément pour ce champ"
msgid "{0}:"
msgstr "{0} :"
@@ -12134,9 +12210,6 @@ 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} : "
@@ -12155,6 +12228,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 (*.*)"
@@ -12189,9 +12272,59 @@ msgstr ""
"La valeur n’est pas un identifiant OSM valide. Veuillez entrer un entier "
"positif"
+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 "Cut"
msgstr "Couper"
+msgid "Right click = copy to clipboard"
+msgstr "Clic droit = copier vers le presse-papiers"
+
+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 ""
@@ -12228,11 +12361,9 @@ 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é."
@@ -12286,40 +12417,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…"
@@ -12424,6 +12542,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."
@@ -12439,15 +12560,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}."
@@ -12534,8 +12661,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é !"
@@ -12651,48 +12778,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 "
@@ -12702,11 +12794,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…"
@@ -12740,13 +12830,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 ""
@@ -12845,12 +12930,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 ""
@@ -13068,10 +13150,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 "RemoteControl::Accepting connections on port {0}"
msgstr "Contrôle à distance::Connexions acceptées sur le port {0}"
@@ -13122,6 +13208,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."
@@ -13157,20 +13252,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"
-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: "
@@ -13193,6 +13288,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"
@@ -13200,6 +13304,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}''."
@@ -13278,18 +13385,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é"
@@ -13464,11 +13571,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"
@@ -13482,30 +13589,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}''"
@@ -13580,11 +13679,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…"
@@ -13598,18 +13694,31 @@ 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 ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+msgid "Plugin list download error"
+msgstr "Erreur de téléchargemnt de la liste des plugins"
+
+msgid "JOSM failed to download plugin list:"
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}''"
+msgid "Details:"
+msgstr "Détails:"
-msgid "Parsing plugin list from site ''{0}''"
-msgstr "Analyse de la liste des greffons du site ''{0}''"
+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 "Écriture de la liste des greffons dans le cache ''{0}''"
+
+msgid "Parsing plugin list from site ''{0}''"
+msgstr "Analyse de la liste des greffons du site ''{0}''"
msgid ""
"Failed to parse plugin list document from site ''{0}''. Skipping site. "
@@ -14052,16 +14161,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}"
+msgid "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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
-"Attention : l’accès au dossier ''{0}'' a échoué pour des raisons de "
-"sécurité. Exception : {1}"
msgid "{0}... [please type its number]"
msgstr "{0}... [veuillez saisir son nombre]"
@@ -14073,9 +14178,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 "
@@ -14112,8 +14260,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 "
@@ -14463,6 +14625,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 ""
@@ -14770,6 +14937,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."
@@ -14831,9 +15001,6 @@ 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 "Fonctions d''édition pour OpenSeaMap"
@@ -14877,6 +15044,11 @@ 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."
@@ -15019,6 +15191,9 @@ msgstr "Remblai"
msgid "Lit"
msgstr "Éclairé"
+msgid "Toll"
+msgstr "Péage"
+
msgid "Motorway Link"
msgstr "Bretelle d’accès à une autoroute"
@@ -15109,6 +15284,50 @@ msgstr "Rue résidentielle"
msgid "Edit Residential Street"
msgstr "Modifier une rue résidentielle"
+msgid "Bicycle Road"
+msgstr "Piste cyclable"
+
+msgid "Edit Bicycle Road"
+msgstr "Edition des pistes cyclables"
+
+msgid "Highway type"
+msgstr "Type de route"
+
+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"
@@ -15127,11 +15346,11 @@ 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"
@@ -15142,6 +15361,9 @@ msgstr "allée"
msgid "parking_aisle"
msgstr "voie de parking"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Voie de parking"
@@ -15169,18 +15391,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"
@@ -15190,9 +15406,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"
@@ -15202,15 +15415,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"
@@ -15256,6 +15469,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)"
@@ -15340,6 +15556,9 @@ msgstr "Modifier un pont"
msgid "viaduct"
msgstr "viaduc"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr "tournant"
@@ -15454,21 +15673,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"
@@ -15484,11 +15712,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"
@@ -15523,8 +15751,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"
@@ -15592,12 +15820,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"
@@ -15613,15 +15847,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"
@@ -15643,6 +15868,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"
@@ -15652,6 +15886,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"
@@ -15661,11 +15898,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"
@@ -15697,9 +15931,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"
@@ -15742,26 +15973,35 @@ 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 "Bollard type"
-msgstr ""
+msgstr "Type de plot"
msgid "rising"
msgstr "levé"
msgid "removable"
-msgstr ""
+msgstr "Amovible"
+
+msgid "plastic"
+msgstr "plastique"
msgid "Cycle Barrier"
msgstr "Barrière pour cycles"
msgid "Edit Cycle Barrier"
-msgstr ""
+msgstr "Modifier une barrière pour cycles"
msgid "Cattle Grid"
msgstr "Barrière canadienne"
@@ -15773,7 +16013,7 @@ msgid "Bus Trap"
msgstr "Entrée de voie de bus (Allemagne)"
msgid "Edit Bus Trap"
-msgstr ""
+msgstr "Modifier une entrée de voie de bus"
msgid "Spikes"
msgstr "Pointes"
@@ -15806,10 +16046,10 @@ msgid "Genus"
msgstr "Genre"
msgid "Species"
-msgstr ""
+msgstr "Espèce"
msgid "Taxon"
-msgstr ""
+msgstr "Taxon"
msgid "Fence"
msgstr "Clôture"
@@ -15826,18 +16066,6 @@ msgstr ""
msgid "electric"
msgstr "électrique"
-msgid "roundpole"
-msgstr ""
-
-msgid "split_rail"
-msgstr "Clôture de perches"
-
-msgid "chain"
-msgstr "chaîne"
-
-msgid "hedge"
-msgstr "haie"
-
msgid "pole"
msgstr "pylône"
@@ -15847,6 +16075,15 @@ msgstr ""
msgid "Edit Guard Rail"
msgstr ""
+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"
@@ -15869,8 +16106,9 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr "Fossé"
+msgctxt "Barrier"
msgid "Edit Ditch"
-msgstr "Modifier un fossé"
+msgstr ""
msgid "Kerb"
msgstr ""
@@ -15878,11 +16116,11 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
-msgstr "Entrée"
+msgid "Entrance (barrier opening)"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Modifier une entrée"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Portail"
@@ -15935,12 +16173,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr "Matériau"
-
-msgid "stone"
-msgstr "pierre"
-
msgid "Turnstile"
msgstr "Portillon"
@@ -16001,12 +16233,21 @@ msgstr "Modifier un canal d’évacuation"
msgid "Ditch"
msgstr "Fossé"
+msgid "Edit Ditch"
+msgstr "Modifier un fossé"
+
msgid "Stream"
msgstr "Ruisseau"
msgid "Edit Stream"
msgstr "Modifier un ruisseau"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Canal"
@@ -16046,9 +16287,6 @@ msgstr "Modifier un barrage"
msgid "Groyne"
msgstr "Épi"
-msgid "Edit Groyne"
-msgstr "Modifier un épi"
-
msgid "Breakwater"
msgstr "Digue"
@@ -16082,6 +16320,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"
@@ -16163,20 +16416,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"
@@ -16250,7 +16508,7 @@ msgstr "tourisme"
msgid "freight"
msgstr "Fret"
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -16274,11 +16532,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"
@@ -16289,9 +16550,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"
@@ -16343,6 +16601,9 @@ msgstr ""
msgid "Level Crossing"
msgstr "Passage à niveau routier"
+msgid "Edit Level Crossing"
+msgstr "Edition de passage à niveau"
+
msgid "Supervised"
msgstr "supervisé"
@@ -16355,6 +16616,41 @@ 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"
+
+msgid "Sound signals"
+msgstr "Signaux sonores"
+
+msgid "Barrier"
+msgstr "Barrière"
+
msgid "half"
msgstr "moyenne"
@@ -16466,13 +16762,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"
@@ -16482,13 +16776,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"
@@ -16505,12 +16797,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"
@@ -16538,9 +16830,6 @@ msgstr "Place de stationnement"
msgid "Edit Parking space"
msgstr "Modifier une place de stationnement"
-msgid "rooftop"
-msgstr "toit"
-
msgid "Capacity"
msgstr "Capacité"
@@ -16562,11 +16851,30 @@ 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 "Su 10:00+"
+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 "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"
@@ -16715,6 +17023,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"
@@ -16736,6 +17047,12 @@ msgstr "Garagiste"
msgid "Edit Car Repair"
msgstr "Modifier un garagiste"
+msgid "Parts"
+msgstr "Pièces détachées"
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr "Magasin de pneus"
@@ -16763,6 +17080,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"
@@ -16787,22 +17110,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"
@@ -16824,9 +17131,6 @@ msgstr "Contrôle technique"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Pièces détachées"
-
msgid "Clothes"
msgstr "Vêtements"
@@ -17021,6 +17325,9 @@ msgstr "Plateforme"
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr "Bus"
@@ -17051,6 +17358,9 @@ msgstr "Funiculaire"
msgid "Ferry"
msgstr "Ferry"
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Banc"
@@ -17063,9 +17373,6 @@ msgstr "Accessible aux fauteuils roulants"
msgid "limited"
msgstr "limité"
-msgid "only"
-msgstr "uniquement"
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -17075,9 +17382,14 @@ msgstr ""
msgid "funicular"
msgstr "funiculaire"
+msgctxt "railway"
msgid "Station"
msgstr "Gare"
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Modifier une station"
+
msgid "Building"
msgstr "Bâtiment"
@@ -17090,6 +17402,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"
@@ -17114,14 +17429,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"
@@ -17170,8 +17477,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"
@@ -17224,6 +17531,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"
@@ -17246,21 +17568,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"
@@ -17450,9 +17757,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-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 "Tourism"
msgstr "Tourisme"
@@ -17474,9 +17778,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"
@@ -17489,6 +17799,9 @@ msgstr "rue"
msgid "scheme"
msgstr "plan"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Zone affichée"
@@ -17528,6 +17841,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"
@@ -17549,23 +17865,35 @@ msgstr "flore"
msgid "Guidepost"
msgstr "Poteau indicateur"
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr "Lieu d’informations"
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
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"
@@ -17694,50 +18022,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"
@@ -17754,6 +18076,12 @@ msgstr "catholicisme"
msgid "evangelical"
msgstr "évangélisme"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "témoins de Jehovah"
@@ -17766,6 +18094,9 @@ msgstr "méthodisme"
msgid "mormon"
msgstr "mormonisme"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "orthodoxie"
@@ -17784,92 +18115,192 @@ msgstr "Société religieuse des Amis"
msgid "roman_catholic"
msgstr ""
-msgid "shia"
-msgstr "chiisme"
+msgid "russian_orthodox"
+msgstr ""
-msgid "sunni"
-msgstr "sunnisme"
+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 "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 "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"
@@ -17904,6 +18335,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é"
@@ -17914,10 +18351,10 @@ msgid "Edit Hospital"
msgstr "Modifier un hôpital"
msgid "Clinic"
-msgstr ""
+msgstr "Clinique"
msgid "Edit Clinic"
-msgstr ""
+msgstr "Editer la clinique"
msgid "Doctors"
msgstr "Cabinet médical"
@@ -17985,12 +18422,66 @@ msgstr "Cabinet vétérinaire"
msgid "Edit Veterinary"
msgstr "Modifier un cabinet vétérinaire"
-msgid "Drinking water"
-msgstr "Eau potable"
+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"
@@ -18000,6 +18491,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"
@@ -18009,30 +18524,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é"
@@ -18061,8 +18582,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"
@@ -18088,21 +18609,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 "plastic"
-msgstr "plastique"
-
msgid "Amount of Seats"
msgstr "Nombre de places"
@@ -18137,8 +18652,17 @@ msgstr "Modifier un abri de chasse"
msgid "Height"
msgstr "Hauteur"
+msgctxt "height"
msgid "low"
-msgstr "Faible"
+msgstr ""
+
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
msgid "Hide"
msgstr "Camouflé"
@@ -18146,9 +18670,6 @@ 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"
@@ -18180,6 +18701,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"
@@ -18217,119 +18741,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"
@@ -18361,26 +18921,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)"
@@ -18388,6 +18949,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)"
@@ -18421,6 +18991,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"
@@ -18477,7 +19063,7 @@ msgid "Skating"
msgstr "Roller"
msgid "Edit Skating"
-msgstr "Modifier un terrain de roller"
+msgstr ""
msgid "ice_rink"
msgstr "patinoire"
@@ -18521,38 +19107,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"
@@ -18593,21 +19197,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)"
@@ -18744,6 +19344,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"
@@ -18756,59 +19368,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"
@@ -19034,42 +19720,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 "Edit Measurement Station"
-msgstr "Modifier une station météorologique"
+msgid "Tide Level"
+msgstr ""
-msgid "Measurement"
-msgstr "Capteur"
+msgid "Traffic"
+msgstr ""
-msgid "particulate_matter"
-msgstr "qualité de l’air"
+msgid "Air Quality"
+msgstr ""
-msgid "seismic"
-msgstr "sismique"
+msgid "Noise"
+msgstr ""
-msgid "water_level"
-msgstr "niveau d’eau"
+msgid "GPS Signals"
+msgstr ""
-msgid "weather"
-msgstr "météorologique"
+msgid "GLONASS Signals"
+msgstr ""
-msgid "Recording"
-msgstr "Mesure"
+msgid "Galileo Signals"
+msgstr ""
-msgid "manually"
-msgstr "manuelle"
+msgid "Radiation"
+msgstr ""
-msgid "automated"
-msgstr "automatique"
+msgid "Seismic Activity"
+msgstr ""
-msgid "remote"
-msgstr "distante"
+msgid "Recording:"
+msgstr ""
-msgctxt "display"
-msgid "no"
-msgstr "aucun"
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
+msgstr ""
msgid "Survey Point"
msgstr "Point géodésique"
@@ -19077,8 +19789,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"
@@ -19089,12 +19801,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"
@@ -19146,89 +19948,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"
+msgstr ""
+
+msgid "biomass / waste"
+msgstr ""
+msgctxt "generator method"
msgid "photovoltaic"
-msgstr "solaire photovoltaïque"
+msgstr "Génerateur photovoltaique"
-msgid "pumped-storage"
-msgstr "pompage-turbinage"
+msgctxt "generator method"
+msgid "pyrolysis"
+msgstr ""
+
+msgctxt "generator method"
+msgid "run-of-the-river"
+msgstr ""
-msgid "pumping"
-msgstr "pompe à chaleur (géothermie)"
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
-msgid "pyrolysis"
-msgstr "pyrolyse"
+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 "run-of-the-river"
-msgstr "fil de l’’eau"
+msgid "tokamak"
+msgstr ""
-msgid "thermal"
-msgstr "transfert thermique"
+msgid "vertical_axis"
+msgstr ""
-msgid "Output forms of energy"
-msgstr "Formes d’énergie en sortie"
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
-msgid "electricity"
-msgstr "électricité"
+msgid "nuclear fission"
+msgstr "Fission nucléaire"
-msgid "2 W"
-msgstr "2 W"
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
-msgid "3 kW"
-msgstr "3 kW"
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
-msgid "5 MW"
-msgstr "5 MW"
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
-msgid "7 GW"
-msgstr "7 GW"
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
-msgid "hot water"
-msgstr "eau chaude"
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
-msgid "hot air"
-msgstr "air chaud"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
-msgid "cold water"
-msgstr "eau froide"
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
-msgid "cold air"
-msgstr "air froid"
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
-msgid "compressed air"
-msgstr "air comprimé"
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
-msgid "steam"
-msgstr "vapeur"
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
-msgid "vacuum"
-msgstr "vide"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
-msgid "battery charging"
-msgstr "charge de batterie"
+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"
@@ -19239,6 +20144,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"
@@ -19254,6 +20174,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"
@@ -19272,13 +20195,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"
@@ -19385,11 +20306,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"
@@ -19400,8 +20321,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"
@@ -19421,6 +20342,9 @@ 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"
@@ -19433,9 +20357,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr "Magasin bio"
-
msgid "Edit Organic/Bio"
msgstr "Modifier Organique/Bio"
@@ -19505,8 +20426,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"
@@ -19526,14 +20447,14 @@ 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"
@@ -19541,9 +20462,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"
@@ -19569,6 +20489,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"
@@ -19605,11 +20531,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"
@@ -19638,8 +20585,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"
@@ -19650,20 +20597,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"
@@ -19698,8 +20645,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"
@@ -19911,6 +20858,12 @@ msgstr "Sommet"
msgid "Edit Peak"
msgstr "Modifier un sommet"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Glacier"
@@ -19950,26 +20903,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"
@@ -19977,15 +20939,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 ""
@@ -20061,6 +21014,12 @@ msgstr "Prairie"
msgid "Edit Meadow Landuse"
msgstr "Modifier une prairie"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Vigne"
@@ -20115,7 +21074,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"
@@ -20127,6 +21086,9 @@ msgstr "Petit cimetière"
msgid "Edit Graveyard"
msgstr "Modifier un petit cimetière"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Cimetière"
@@ -20202,6 +21164,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"
@@ -20238,6 +21227,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)"
@@ -20406,20 +21407,49 @@ msgstr "Route générale"
msgid "Edit general route"
msgstr "Editer la route générale"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+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"
@@ -20466,20 +21496,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 :"
@@ -20502,8 +21535,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)"
@@ -20598,18 +21631,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"
@@ -20619,8 +21661,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"
@@ -20628,11 +21673,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"
@@ -20649,6 +21694,9 @@ msgstr "rapides"
msgid "railwaypoint"
msgstr "gare/arrêt ferroviaire"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr "dépôt de locomotives"
@@ -20664,29 +21712,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"
@@ -20706,20 +21754,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"
@@ -20793,11 +21841,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"
@@ -20811,9 +21862,6 @@ msgstr "Village/Ville"
msgid "One Way"
msgstr "Sens unique"
-msgid "Church"
-msgstr "Église"
-
msgid "Fuel Station"
msgstr "Station essence"
@@ -20841,6 +21889,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"
@@ -20874,23 +21925,53 @@ msgstr ""
msgid "street name contains ss"
msgstr "le nom de rue contient ss"
-msgid "relation without type"
-msgstr "relation sans type"
+msgid "relation without type"
+msgstr "relation sans type"
+
+msgid "restaurant without name"
+msgstr "restaurant sans nom"
+
+msgid "unusual tag combination (highway & waterway)"
+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 "restaurant without name"
-msgstr "restaurant sans nom"
+msgid "power line without voltage"
+msgstr ""
-msgid "unusual tag combination (highway & waterway)"
-msgstr "Combinaison de tag incompatible (highway et waterway)"
+msgid "substation key without power=substation"
+msgstr ""
-msgid "unusual tag combination (highway & natural)"
-msgstr "Combinaison de tag incompatible (highway et natural)"
+msgid "transformer key without power"
+msgstr ""
-msgid "natural water used for swimming pool"
-msgstr "Eau naturelle utilisée pour une piscine"
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
-msgid "incline without highway"
-msgstr "inclinaison sans route"
+msgid "incline without highway or railway"
+msgstr "Tag inclide sans highway ou railway"
msgid "junction without highway"
msgstr "jonction sans route"
@@ -20901,8 +21982,8 @@ 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 "living_street sans le tag highway"
@@ -20919,8 +22000,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"
@@ -20995,7 +22076,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 ""
@@ -21034,22 +22115,133 @@ msgid "canal without waterway"
msgstr "canal sans waterway"
msgid "have_riverbank without waterway"
-msgstr ""
+msgstr "Berge( riverbank) sans cours d'eau"
-msgid "tunnel without highway/railway/waterway"
-msgstr "tag tunnel utilisé sans tag highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
-msgid "bridge without highway/railway/waterway"
-msgstr "bridge sans 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 physical linear feature"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
-msgstr "maxspeed sans 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"
msgstr "religion sans dénomination"
@@ -21067,31 +22259,76 @@ 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"
+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 "Yahoo Sat"
+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 "Vue satellite de Yahoo"
+
msgid "Bing Sat"
+msgstr "Vue satellite de Bing"
+
+msgid "HDDM (Humanitarian OpenStreetMap)"
msgstr ""
msgid "MapBox Satellite"
-msgstr ""
+msgstr "Vue satellite de MapBox"
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"
@@ -21112,7 +22349,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -21121,6 +22358,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -21267,6 +22507,29 @@ 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 ""
@@ -21432,7 +22695,37 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+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 "MassGIS L3 Parcels"
@@ -21477,6 +22770,39 @@ msgstr ""
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 "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"
@@ -21694,6 +23020,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."
@@ -21715,14 +23053,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}''."
@@ -22000,10 +23332,13 @@ 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 "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -22211,8 +23546,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."
@@ -22588,15 +23923,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"
@@ -22785,6 +24111,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"
@@ -22805,12 +24134,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "Élevée"
-
-msgid "medium"
-msgstr "Moyenne"
-
msgid "symbol"
msgstr "symbole"
@@ -22962,6 +24285,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 :"
@@ -22983,6 +24309,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 ?"
@@ -23128,6 +24457,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 "Refine georeferencing"
@@ -23143,7 +24478,7 @@ msgid "Get a new cookie (session timeout)"
msgstr "Obtenir un nouveau cookie (session expirée)"
msgid "Save image as..."
-msgstr ""
+msgstr "Sauvegarder l'image sous..."
msgid "PNG files (*.png)"
msgstr "Fichiers PNG (*.png)"
@@ -23152,7 +24487,7 @@ msgid "GeoTiff files (*.tif)"
msgstr ""
msgid "Export image (only raster images)"
-msgstr ""
+msgstr "Export de l'image (seulement imagerie raster)"
msgid ""
"Click first corner for image cropping\n"
@@ -23185,6 +24520,8 @@ 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."
@@ -23234,8 +24571,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."
@@ -23289,7 +24629,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"
@@ -23337,7 +24677,7 @@ 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 ""
+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."
@@ -23415,7 +24755,7 @@ msgid "Install"
msgstr "Installer"
msgid "Public"
-msgstr ""
+msgstr "Publique"
msgid "Could not get server response, check logs"
msgstr ""
@@ -23433,27 +24773,27 @@ msgid "Failed to get messages as {0}:"
msgstr ""
msgid "GeoChat"
-msgstr ""
+msgstr "GeoChat"
msgid "Open GeoChat panel"
-msgstr ""
+msgstr "Ouverture du contrôle GeoChat"
msgid "Zoom in to see messages"
msgstr ""
msgid "Login"
-msgstr ""
+msgstr "Connexion"
msgid "Enable autologin"
-msgstr ""
+msgstr "Activer la connexion automatique"
msgid "{0} user"
msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} utilisateur"
+msgstr[1] "{0} utilisateurs"
msgid "not logged in"
-msgstr ""
+msgstr "non connecté"
msgid "User {0} has left"
msgstr ""
@@ -23462,22 +24802,22 @@ msgid "User {0} is mapping nearby"
msgstr ""
msgid "Users mapping nearby:"
-msgstr ""
+msgstr "Des utilisateurs contribuent à proximté"
msgid "Private chat"
-msgstr ""
+msgstr "Chat privé"
msgid "Close tab"
-msgstr ""
+msgstr "Fermer l'onglet"
msgid "Logout"
-msgstr ""
+msgstr "Déconnexion"
msgid "Clear log"
-msgstr ""
+msgstr "Effacer le journal"
msgid "Show users on map"
-msgstr ""
+msgstr "Afficher les utilisateurs sur la carte"
msgid "Position only"
msgstr "Seulement la position"
@@ -23520,27 +24860,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"
@@ -23985,7 +25307,7 @@ msgid "Open Imagery XML file"
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 ""
@@ -23994,46 +25316,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 ""
@@ -24042,13 +25370,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"
@@ -24057,10 +25385,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"
@@ -24080,13 +25408,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 ""
@@ -24107,19 +25435,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 "
@@ -24163,22 +25491,22 @@ msgid "This string should be 3 to 200 letters long."
msgstr ""
msgid "Adjust imagery"
-msgstr ""
+msgstr "Ajustement de l'imagerie"
msgid "Adjust the position of the selected imagery layer"
-msgstr ""
+msgstr "Ajuster la position du calque d'imagerie selectionné"
msgid "Please select the imagery layer to adjust."
-msgstr ""
+msgstr "Merci de selectionné le calque d'imagerie à ajuster"
msgid "Start adjusting"
-msgstr ""
+msgstr "Début de l'ajustemeent"
msgid "There are currently no imagery layer to adjust."
msgstr ""
msgid "No layers to adjust"
-msgstr ""
+msgstr "Pas de calque à ajuster"
msgid "Normal"
msgstr "Normal"
@@ -24680,9 +26008,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"
@@ -24729,13 +26083,14 @@ msgid "XAPI query: "
msgstr "Requête XAPI : "
msgid "Download from Overpass API ..."
-msgstr ""
+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 ""
+msgstr "Requête Overpass : "
msgid "Select OSM mirror URL"
msgstr "Sélectionner l’’URL du miroir OSM"
@@ -24924,7 +26279,7 @@ msgid "OpenData XML files"
msgstr "Fichiers OpenData XML"
msgid "Download open data"
-msgstr ""
+msgstr "Téléchargement de données ouvertes"
msgid "License URL not available: {0}"
msgstr ""
@@ -25086,7 +26441,10 @@ msgid "File to load"
msgstr "Fichier à charger"
msgid "Reading 7Zip file..."
-msgstr ""
+msgstr "Lecture du fichier 7Zip..."
+
+msgid "Reading Zip file..."
+msgstr "Lecture d’un fichier Zip..."
msgid "Reading Zip file..."
msgstr "Lecture d’un fichier Zip..."
@@ -25132,6 +26490,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 ""
@@ -25152,7 +26512,7 @@ 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 ""
@@ -25177,10 +26537,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 ""
@@ -25199,7 +26559,7 @@ msgid "Could not load module {0}. Delete from preferences?"
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 "
@@ -25210,7 +26570,7 @@ msgid "Loading modules ..."
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}''..."
@@ -25231,7 +26591,7 @@ 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 ""
@@ -25265,12 +26625,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 ""
@@ -25301,7 +26663,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 "
@@ -25355,9 +26717,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 "Process queue"
msgstr "Traiter la file d’attente"
@@ -25414,18 +26773,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"
@@ -25488,7 +26835,7 @@ msgid "OSM Server Files pbf compressed"
msgstr "Fichiers compressés pbf du serveur OSM"
msgid "Download PBF"
-msgstr ""
+msgstr "Téléchargement de PBF"
msgid "Invalid changeset id: {0}"
msgstr "Identifiant de groupe de modifications invalide : {0}"
@@ -25780,6 +27127,27 @@ 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 "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} ?"
@@ -25935,6 +27303,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"
@@ -25968,7 +27340,7 @@ 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 ""
@@ -25983,7 +27355,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 ""
@@ -26049,7 +27421,7 @@ msgid "Selected: {0}"
msgstr "Sélectionné : {0}"
msgid "Proj4J Plugin"
-msgstr ""
+msgstr "Proj4J greffon"
msgid "Code"
msgstr "Code"
@@ -26259,9 +27631,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 :"
@@ -26441,7 +27810,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 ""
@@ -26450,7 +27819,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"
@@ -26462,7 +27831,7 @@ msgid "Node without ''label'' or ''admin_centre'' role found"
msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
-msgstr ""
+msgstr "Présence d'un way sans rôle \"inner\" ou \"outer\""
msgid "Revert changeset fully"
msgstr "Annuler le groupe de modifications"
@@ -26485,6 +27854,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}"
@@ -26522,23 +27894,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 "Spain"
msgstr ""
@@ -26649,9 +28044,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)"
@@ -26671,6 +28063,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 ""
@@ -26687,7 +28082,7 @@ msgid ""
msgstr ""
msgid "SDS data file"
-msgstr ""
+msgstr "Fichier de données SDS"
msgid "Load..."
msgstr "Charger..."
@@ -26702,7 +28097,7 @@ msgid "SDS"
msgstr ""
msgid "Information about SDS."
-msgstr ""
+msgstr "Information sur SDS"
msgid "About SDS..."
msgstr "Au sujet de SDS..."
@@ -26738,13 +28133,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 ""
@@ -26756,7 +28151,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..."
@@ -26765,7 +28160,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 "Could not back up file. Exception is: {0}"
msgstr "Impossible de récupérer le fichier. Exception : {0}"
@@ -26830,20 +28228,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"
@@ -26988,7 +28386,7 @@ msgid "Street name: "
msgstr "Nom de la rue : "
msgid "Building: "
-msgstr ""
+msgstr "Bâtiment : "
msgid "Even/Odd"
msgstr "Pair/Impair"
@@ -27070,6 +28468,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"
@@ -27108,6 +28595,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..."
@@ -27277,9 +28769,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 :"
@@ -28468,9 +29957,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"
@@ -28598,7 +30084,7 @@ msgid "mute"
msgstr "muet"
msgid "Walking Papers Scanned Map"
-msgstr ""
+msgstr "Carte des Walking Papers scannés"
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -28710,21 +30196,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"
@@ -28733,28 +30221,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"
@@ -28769,9 +30257,6 @@ 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"
diff --git a/i18n/po/gl.po b/i18n/po/gl.po
index 3dc0a74..1750b92 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-08-04 03:41+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-08-05 04:43+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ 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 ""
@@ -61,6 +64,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "A executar arranque da plataforma"
@@ -165,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 "
@@ -266,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"
@@ -305,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}"
@@ -361,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"
@@ -548,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)"
@@ -664,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"
@@ -819,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"
@@ -1017,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 "
@@ -1047,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>"
@@ -1223,9 +1213,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1371,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"
@@ -1478,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"
@@ -1768,6 +1772,9 @@ 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)"
@@ -1996,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] ""
@@ -2440,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 ""
@@ -2644,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 "
@@ -2738,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}"
@@ -2774,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"
@@ -2800,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}''"
@@ -2912,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"
@@ -2972,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"
@@ -3005,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"
@@ -3031,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}"
@@ -3062,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 "
@@ -3086,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 "
@@ -3099,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 "
@@ -3126,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}"
@@ -3157,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}»"
@@ -3325,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 ""
@@ -3433,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 ""
@@ -3471,9 +3475,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3514,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"
@@ -3538,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 ""
@@ -3599,6 +3612,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Nodos duplicados"
@@ -3681,6 +3697,15 @@ 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"
@@ -3750,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 ""
@@ -3807,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})"
@@ -3845,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}"
@@ -3988,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"
@@ -4063,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}"
@@ -4093,9 +4127,6 @@ msgstr "construcción"
msgid "area"
msgstr "área"
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -4120,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''"
@@ -4186,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)"
@@ -4310,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"
@@ -4554,6 +4564,18 @@ 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"
@@ -4660,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 ""
@@ -4982,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."
@@ -4989,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."
@@ -4996,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."
@@ -5012,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"
@@ -5028,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"
@@ -5084,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"
@@ -5355,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 "
@@ -5920,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"
@@ -6003,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"
@@ -6096,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 "
@@ -6276,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 ""
@@ -6592,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 ""
@@ -6660,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 "Properties/Memberships"
-msgstr "Propiedades/Relacións"
+msgid "Discardable key: selection Background"
+msgstr ""
+
+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"
@@ -6702,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)"
@@ -6862,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"
@@ -7193,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"
@@ -7330,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, "
@@ -7354,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"
@@ -7471,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."
@@ -7580,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"
@@ -7680,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"
@@ -7699,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:"
@@ -7765,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"
@@ -7841,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 ""
@@ -7856,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"
@@ -8072,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 "
@@ -8092,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 ""
@@ -8107,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"
@@ -8114,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 ..."
@@ -8230,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] ""
@@ -8242,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>"
@@ -8258,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:"
@@ -8404,7 +8474,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8434,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"
@@ -8789,9 +8859,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr "Ler fotos..."
@@ -8810,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"
@@ -8867,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"
@@ -8937,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 ""
@@ -9130,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}''..."
@@ -9152,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"
@@ -9162,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:"
@@ -9383,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}''"
@@ -10113,6 +10181,45 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "imagery"
+msgstr ""
+
+msgid "Reset preferences"
+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 "Load profile"
+msgstr ""
+
+msgid "Save {0} profile"
+msgstr ""
+
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
+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 "Select Setting Type:"
msgstr ""
@@ -10204,6 +10311,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 ""
@@ -10261,6 +10371,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 ""
@@ -10734,6 +10849,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"
@@ -10797,8 +10918,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"
@@ -11055,21 +11176,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"
@@ -11091,6 +11197,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}''"
@@ -11141,8 +11262,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:"
@@ -11151,20 +11272,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 "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 ""
@@ -11247,16 +11373,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 ""
@@ -11327,8 +11447,8 @@ msgstr "Aplicar axuste preestablecido"
msgid "New relation"
msgstr ""
-msgid "Change Properties"
-msgstr "Cambiar Propiedades"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -11406,9 +11526,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr "Non se puido ler a fonte de etiquetado preestablecido: {0}"
-
msgid "Error parsing {0}: "
msgstr "Erro analizando {0}: "
@@ -11427,6 +11544,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 ""
@@ -11458,9 +11585,57 @@ 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 "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 "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 ""
@@ -11496,7 +11671,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 ""
@@ -11536,28 +11711,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..."
@@ -11657,6 +11830,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 ""
@@ -11672,12 +11848,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}."
@@ -11756,8 +11940,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!"
@@ -11855,62 +12039,31 @@ 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}''."
+"Unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
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}''."
+"Illegal document structure. Found node, way, or relation outside of "
+"''create'', ''modify'', or ''delete''."
msgstr ""
-"valor ilegal para o atributo obrigatorio «{0}» de tipo enteiro longo (>=0), "
-"obtido «{1}»"
+"Estrutura de documento ilegal. Atopouse un nodo, vía, ou relación fora de "
+"«create», «modify», ou «delete»."
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgid ""
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
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 "Parsing changeset content ..."
+msgstr "Procesando contido do concunto de cambios..."
-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 "
-"({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 "
-"''create'', ''modify'', or ''delete''."
-msgstr ""
-"Estrutura de documento ilegal. Atopouse un nodo, vía, ou relación fora de "
-"«create», «modify», ou «delete»."
-
-msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
-msgstr ""
-
-msgid "Parsing changeset content ..."
-msgstr "Procesando contido do concunto de cambios..."
-
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
-msgstr "Valor ilegal para o atributo «{0}». Obtívose «{1}»."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgstr "Valor ilegal para o atributo «{0}». Obtívose «{1}»."
msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
msgstr "Valor numérico ilegal para o atributo «{0}». Obtívose «{1}»."
@@ -11931,11 +12084,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>"
@@ -12026,8 +12176,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}."
@@ -12234,7 +12384,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 "RemoteControl::Accepting connections on port {0}"
@@ -12280,6 +12436,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."
@@ -12310,19 +12475,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 ""
@@ -12344,11 +12509,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 ""
@@ -12418,18 +12595,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}»"
@@ -12596,13 +12769,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"
@@ -12616,26 +12787,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}»"
@@ -12710,8 +12877,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..."
@@ -12726,9 +12892,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}''"
@@ -13056,12 +13237,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -13072,9 +13252,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 ""
@@ -13106,9 +13329,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."
@@ -13433,6 +13670,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 ""
@@ -13689,6 +13931,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."
@@ -13752,9 +13997,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 ""
@@ -13797,6 +14039,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"
@@ -13934,6 +14181,9 @@ msgstr "Terraplén"
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "Peaxe"
+
msgid "Motorway Link"
msgstr "Enlace de autopista"
@@ -14024,6 +14274,50 @@ msgstr "Rúa urbana"
msgid "Edit Residential Street"
msgstr "Editar rúa urbana"
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr "Tipo de carretera"
+
+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 "si"
+
+msgid "no"
+msgstr "non"
+
+msgid "destination"
+msgstr "destino"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr "Rúa residencial"
@@ -14042,11 +14336,11 @@ msgstr "Área"
msgid "Service"
msgstr "Servizo"
-msgid "Edit Serviceway"
-msgstr "Editar vía de servicio"
+msgid "Edit Service Way"
+msgstr ""
-msgid "Serviceway type"
-msgstr "Tipo de vía de servicio"
+msgid "Service way type"
+msgstr ""
msgid "alley"
msgstr "callejón"
@@ -14057,6 +14351,9 @@ 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"
@@ -14084,18 +14381,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"
@@ -14105,9 +14396,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr "destino"
-
msgid "delivery"
msgstr "reparto de mercancías"
@@ -14117,15 +14405,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"
@@ -14171,6 +14459,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)"
@@ -14255,6 +14546,9 @@ msgstr "Editar ponte"
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -14359,20 +14653,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"
@@ -14389,10 +14692,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"
@@ -14428,7 +14731,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -14497,12 +14800,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"
@@ -14518,15 +14827,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)"
@@ -14548,6 +14848,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"
@@ -14557,6 +14866,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Mini-rotonda"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Dirección"
@@ -14566,11 +14878,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"
@@ -14602,9 +14911,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"
@@ -14647,6 +14953,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr "Tráfico permitido:"
+msgid "Material"
+msgstr "Material"
+
+msgid "stone"
+msgstr "pedra"
+
msgid "Bollard"
msgstr "Bolardo"
@@ -14662,6 +14974,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr "plástico"
+
msgid "Cycle Barrier"
msgstr "Barreira para bicicletas"
@@ -14731,21 +15046,18 @@ msgstr ""
msgid "electric"
msgstr "electrico"
-msgid "roundpole"
-msgstr ""
+msgid "pole"
+msgstr "poste"
-msgid "split_rail"
+msgid "Guard Rail"
msgstr ""
-msgid "chain"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "hedge"
+msgid "wire"
msgstr ""
-msgid "pole"
-msgstr "poste"
-
msgid "Guard Rail"
msgstr ""
@@ -14774,8 +15086,9 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
-msgstr "Editar acequia"
+msgstr ""
msgid "Kerb"
msgstr ""
@@ -14783,11 +15096,11 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
-msgstr "Entrada"
+msgid "Entrance (barrier opening)"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Editar unha entrada"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Porta"
@@ -14841,12 +15154,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "pedra"
-
msgid "Turnstile"
msgstr "Torno"
@@ -14907,14 +15214,23 @@ msgstr "Editar canal de desaugue"
msgid "Ditch"
msgstr "Acequia"
+msgid "Edit Ditch"
+msgstr "Editar acequia"
+
msgid "Stream"
msgstr "Arroio ou riachuelo"
msgid "Edit Stream"
msgstr "editar arroio ou riachuelo"
-msgid "Canal"
-msgstr "Canal"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
+msgid "Canal"
+msgstr "Canal"
msgid "Edit Canal"
msgstr "Editar un canal"
@@ -14952,9 +15268,6 @@ msgstr "Editar unha presa"
msgid "Groyne"
msgstr "Rompeolas"
-msgid "Edit Groyne"
-msgstr "Editar rompeolas"
-
msgid "Breakwater"
msgstr ""
@@ -14988,6 +15301,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"
@@ -15069,20 +15397,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"
@@ -15156,7 +15489,7 @@ msgstr "turismo"
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -15180,11 +15513,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"
@@ -15195,9 +15531,6 @@ msgstr "Vía estreita"
msgid "Edit Narrow Gauge Rail"
msgstr "Editar vía estreita"
-msgid "Types"
-msgstr "Tipos"
-
msgid "Monorail"
msgstr "Monoraíl"
@@ -15249,6 +15582,9 @@ msgstr ""
msgid "Level Crossing"
msgstr "Paso a nivel"
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -15261,18 +15597,32 @@ msgstr ""
msgid "Barrier"
msgstr ""
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
msgid "half"
-msgstr "media"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "total"
+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"
@@ -15372,13 +15722,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"
@@ -15388,13 +15736,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"
@@ -15411,12 +15757,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)"
@@ -15444,9 +15790,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Capacidade"
@@ -15468,11 +15811,30 @@ 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 "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Martes-Domingo 08:00-15:00;Sabado 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 ""
@@ -15621,6 +15983,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"
@@ -15642,6 +16007,12 @@ msgstr "Taller"
msgid "Edit Car Repair"
msgstr "Editar taller"
+msgid "Parts"
+msgstr "Partes"
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr "Rodas"
@@ -15669,6 +16040,12 @@ msgstr "Alquiler"
msgid "Edit Car Rental"
msgstr "Editar alquiler de automóviles"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "Compartindo"
@@ -15693,22 +16070,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"
@@ -15730,9 +16091,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Partes"
-
msgid "Clothes"
msgstr "Roupas"
@@ -15927,6 +16285,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15957,6 +16318,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Banco"
@@ -15969,9 +16333,6 @@ msgstr "Cadeira de rodas"
msgid "limited"
msgstr "limitado"
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15981,8 +16342,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"
@@ -15996,6 +16362,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"
@@ -16020,14 +16389,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"
@@ -16076,8 +16437,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"
@@ -16130,6 +16491,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"
@@ -16152,21 +16528,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"
@@ -16356,9 +16717,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-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 "Tourism"
msgstr "Turismo"
@@ -16380,9 +16738,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"
@@ -16395,6 +16759,9 @@ msgstr "rúa"
msgid "scheme"
msgstr "esquema"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Mostrar área"
@@ -16434,6 +16801,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"
@@ -16455,23 +16825,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"
@@ -16600,50 +16982,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"
@@ -16660,6 +17036,12 @@ msgstr "católico"
msgid "evangelical"
msgstr "evanxélico"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "testigos de Xenoveva"
@@ -16672,6 +17054,9 @@ msgstr "metodista"
msgid "mormon"
msgstr "mormón"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ortodoxo"
@@ -16690,46 +17075,146 @@ msgstr "cuáquero"
msgid "roman_catholic"
msgstr ""
-msgid "shia"
-msgstr "chiita"
+msgid "russian_orthodox"
+msgstr ""
-msgid "sunni"
-msgstr "suní"
+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"
+msgid "ibadi"
+msgstr ""
+
+msgid "shia"
+msgstr "chiita"
+
+msgid "sunni"
+msgstr "suní"
+
+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 "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"
@@ -16810,6 +17295,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"
@@ -16891,12 +17382,66 @@ msgstr "Veterinario"
msgid "Edit Veterinary"
msgstr "Editar veterinario"
-msgid "Drinking water"
+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"
@@ -16906,6 +17451,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"
@@ -16915,31 +17484,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 ""
@@ -16967,8 +17542,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"
@@ -16994,21 +17569,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 "plastic"
-msgstr "plástico"
-
msgid "Amount of Seats"
msgstr "Numero de asentos"
@@ -17043,8 +17612,17 @@ msgstr "Editar apostadeiro de caza"
msgid "Height"
msgstr "Alto"
+msgctxt "height"
msgid "low"
-msgstr "baixa"
+msgstr ""
+
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
msgid "Hide"
msgstr "Agochar"
@@ -17052,9 +17630,6 @@ msgstr "Agochar"
msgid "Lock"
msgstr "Bloquear"
-msgid "Drinking Water"
-msgstr "Auga potable"
-
msgid "Edit Source of Potable Water"
msgstr ""
@@ -17086,6 +17661,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -17123,119 +17701,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"
@@ -17267,26 +17881,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 ""
@@ -17294,6 +17909,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"
@@ -17327,6 +17951,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"
@@ -17383,7 +18023,7 @@ msgid "Skating"
msgstr "Patinaxe"
msgid "Edit Skating"
-msgstr "Editar patinaxe"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -17427,36 +18067,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 ""
@@ -17499,19 +18157,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 ""
@@ -17650,11 +18304,23 @@ msgstr "Aeródromo de Aeromodelismo"
msgid "Edit Model Aerodrome"
msgstr "Editar Aeródromo de Aeromodelismo"
-msgid "RC Car"
-msgstr "Coches RC"
-
-msgid "Edit RC Car"
-msgstr "Editar coches RC"
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
+msgid "RC Car"
+msgstr "Coches RC"
+
+msgid "Edit RC Car"
+msgstr "Editar coches RC"
msgid "Man Made"
msgstr "Feito polo home"
@@ -17662,60 +18328,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"
@@ -17940,41 +18680,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"
-msgstr "sísmico"
+msgid "Water level"
+msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
-msgstr "o tempo"
+msgid "Traffic"
+msgstr ""
-msgid "Recording"
-msgstr "Gravando"
+msgid "Air Quality"
+msgstr ""
-msgid "manually"
-msgstr "manualmente"
+msgid "Noise"
+msgstr ""
-msgid "automated"
-msgstr "automatico"
+msgid "GPS Signals"
+msgstr ""
-msgid "remote"
-msgstr "remota"
+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"
@@ -17983,8 +18749,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"
@@ -17995,12 +18761,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"
@@ -18052,89 +18908,192 @@ 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 "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 "battery charging"
+msgid "Boiling Water Reactor 4 (BWR-4)"
msgstr ""
-msgid "Power Station"
-msgstr "Central eléctrica"
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Editar central eléctrica"
+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"
@@ -18145,6 +19104,21 @@ 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 ""
@@ -18160,6 +19134,9 @@ msgstr "Editar torre de electricidade"
msgid "Tower reference"
msgstr "Referencia da torre"
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr "Poste"
@@ -18178,13 +19155,11 @@ msgstr "Editar tendido eléctrico"
msgid "Line type"
msgstr "Tipo de liña"
-msgctxt "Power Line"
msgid "line"
-msgstr "liña"
+msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
-msgstr "liña de baixa tensión"
+msgstr ""
msgid "Amount of Cables"
msgstr "Cantidade de cables"
@@ -18291,11 +19266,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"
@@ -18306,8 +19281,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)"
@@ -18327,6 +19302,9 @@ msgstr "Mercado"
msgid "Edit Marketplace"
msgstr "Editar Mercado"
+msgid "Organic"
+msgstr "Orgánico"
+
msgid "Greengrocer"
msgstr "Verdurería"
@@ -18339,9 +19317,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr "Orgánico"
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -18411,8 +19386,8 @@ msgstr ""
msgid "Fabric"
msgstr "Fabrica"
-msgid "Edit Fabric"
-msgstr "Editar Fabrica"
+msgid "Edit Fabric Shop"
+msgstr ""
msgid "Electronic"
msgstr "Electronica"
@@ -18432,14 +19407,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"
@@ -18447,9 +19422,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"
@@ -18475,6 +19449,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"
@@ -18511,11 +19491,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"
@@ -18544,8 +19545,8 @@ msgstr "Editar ferretería"
msgid "Paint"
msgstr "Pintura"
-msgid "Edit Paint"
-msgstr "Editar Pintura"
+msgid "Edit Paint Shop"
+msgstr ""
msgid "Furniture"
msgstr "Mobles"
@@ -18556,20 +19557,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"
@@ -18604,8 +19605,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"
@@ -18817,6 +19818,12 @@ msgstr "Pico"
msgid "Edit Peak"
msgstr "Editar pico"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Glaciar"
@@ -18856,26 +19863,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"
@@ -18883,15 +19899,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 ""
@@ -18967,6 +19974,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"
@@ -19021,8 +20034,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"
@@ -19033,6 +20046,9 @@ msgstr "Camposanto (para os cementerios próximos ás igrexas)"
msgid "Edit Graveyard"
msgstr "Editar camposanto"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Cemiterio"
@@ -19108,6 +20124,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"
@@ -19144,6 +20187,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 ""
@@ -19312,20 +20367,49 @@ msgstr ""
msgid "Edit general route"
msgstr ""
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+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"
@@ -19372,21 +20456,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"
@@ -19408,7 +20495,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -19504,18 +20591,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"
@@ -19525,8 +20621,11 @@ msgstr "barreira"
msgid "motorroad"
msgstr "Autovía"
-msgid "highway_track"
-msgstr "Autopista"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "servizos"
@@ -19534,11 +20633,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"
@@ -19555,6 +20654,9 @@ msgstr "rápidos"
msgid "railwaypoint"
msgstr "Punto ferroviario de referencia"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19570,29 +20672,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"
@@ -19612,20 +20714,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"
@@ -19699,11 +20801,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"
@@ -19717,9 +20822,6 @@ msgstr "Poboación/Cidade"
msgid "One Way"
msgstr "Sentido único"
-msgid "Church"
-msgstr "Igrexa"
-
msgid "Fuel Station"
msgstr "Gasolinera"
@@ -19747,6 +20849,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19792,10 +20897,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"
@@ -19807,7 +20942,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"
@@ -19825,7 +20960,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19942,19 +21077,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 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"
@@ -19973,7 +21219,46 @@ 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 "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 "Landsat"
@@ -19985,19 +21270,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 "skobbler heatmap"
@@ -20018,7 +21312,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -20027,6 +21321,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -20173,6 +21470,29 @@ 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 ""
@@ -20338,6 +21658,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -20383,6 +21706,39 @@ msgstr ""
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 "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"
@@ -20584,6 +21940,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 ""
@@ -20605,14 +21973,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 ""
@@ -20874,10 +22236,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -21081,7 +22446,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"
@@ -21353,15 +22718,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 ""
@@ -21540,6 +22896,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 ""
@@ -21558,12 +22917,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr "símbolo"
@@ -21701,6 +23054,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 ""
@@ -21720,6 +23076,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?"
@@ -21946,7 +23305,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."
@@ -21998,7 +23360,7 @@ msgstr ""
msgid "Color Schemes"
msgstr "Esquemas de cores"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -22222,27 +23584,9 @@ 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 "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"
@@ -23326,9 +24670,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 ""
@@ -23979,9 +25348,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 "Process queue"
msgstr "Procesar a cola"
@@ -24036,18 +25402,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 ""
@@ -24394,6 +25748,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -24545,6 +25920,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 ""
@@ -24862,9 +26240,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:"
@@ -25080,6 +26455,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 ""
@@ -25112,15 +26490,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 ""
@@ -25235,9 +26631,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr "Tipo de carretera"
-
msgid "Speed (Km/h)"
msgstr ""
@@ -25416,19 +26809,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"
@@ -25644,6 +27037,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"
@@ -25683,6 +27165,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..."
@@ -25835,9 +27320,6 @@ msgstr "Asinado cancelado!"
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26834,9 +28316,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr "Vídeo"
-
msgid "Import Video"
msgstr "Importar Video"
@@ -27116,9 +28595,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 be73a8f..6bbbd20 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-08-04 03:41+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-08-05 04:44+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 "
@@ -254,9 +258,6 @@ msgstr "כלי: {0}"
msgid "Please select at least four nodes."
msgstr "נא בחר לפחות ארבעה צמתים."
-msgid "Information"
-msgstr "מידע"
-
msgid "Align Nodes in Line"
msgstr "ישר את הצמתים בשורה"
@@ -293,6 +294,9 @@ msgstr "הבא"
msgid "Nothing selected to zoom to."
msgstr "לא נבחר פריט להתקרבות."
+msgid "Information"
+msgstr "מידע"
+
msgid "Zoom to {0}"
msgstr "התקרב אל {0}"
@@ -347,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} דרכים"
@@ -530,6 +534,9 @@ msgstr "היסטוריה"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "הצג היסטורית מידע אודות דרכי, דמתי ויחוסי OSM"
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -643,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 ""
@@ -793,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"
@@ -979,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 ""
@@ -1002,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>"
@@ -1171,9 +1171,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1312,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"
@@ -1407,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 "בטל"
@@ -1691,6 +1709,9 @@ 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})"
@@ -1912,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] ""
@@ -2340,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 ""
@@ -2539,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 ""
@@ -2626,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 ""
@@ -2662,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"
@@ -2688,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}''"
@@ -2795,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] ""
@@ -2855,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"
@@ -2886,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 ""
@@ -2910,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 ""
@@ -2940,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 ""
@@ -2960,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 ""
@@ -2969,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 ""
@@ -2989,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}"
@@ -3020,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}''."
@@ -3177,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 ""
@@ -3285,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 ""
@@ -3323,9 +3351,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3366,6 +3391,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "כתובות"
@@ -3390,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 ""
@@ -3449,6 +3486,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "נקודות כפולות"
@@ -3531,6 +3571,15 @@ 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 ""
@@ -3600,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 ""
@@ -3657,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})"
@@ -3695,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 ""
@@ -3834,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 "לא יכול למצוא את סוג האלמנט"
@@ -3909,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 ""
@@ -3939,9 +3997,6 @@ msgstr "בניין"
msgid "area"
msgstr "שטח"
-msgid "Unclosed way"
-msgstr "דרך לא סגורה"
-
msgid "Unconnected ways"
msgstr ""
@@ -3966,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''"
@@ -4032,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 ""
@@ -4152,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"
@@ -4387,6 +4425,18 @@ 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 "שמע"
@@ -4491,19 +4541,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 ""
@@ -4791,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."
@@ -4798,6 +4838,9 @@ msgstr ""
"העתק את האלמנטים הנבחרים שלי לפני האלמנט הנבחר הראשון ברשימת האלמנטים "
"הממוזגים"
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -4805,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."
@@ -4820,6 +4872,9 @@ msgstr ""
"העתק את האלמנטים הנבחרים שלהם לפני האלמנט הנבחר הראשון ברשימת האלמנטים "
"הממוזגים"
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4836,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 "מטה"
@@ -4888,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 "נקודה"
@@ -5145,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 ""
@@ -5673,6 +5720,9 @@ msgstr "הצג/הסתר"
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5756,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 "יחסים"
@@ -5847,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 ""
@@ -6018,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 ""
@@ -6305,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"
@@ -6371,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 "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 "שנה יחס"
@@ -6413,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)"
@@ -6573,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"
@@ -6891,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 "סימניות"
@@ -7023,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, "
@@ -7047,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 ""
@@ -7160,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."
@@ -7259,6 +7336,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7346,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"
@@ -7365,13 +7445,19 @@ msgstr "ספק הערה קצרה לשינויים שאתה מעלה:"
msgid "Enter an upload comment"
msgstr ""
-msgid "Changeset id:"
+msgid "Specify the data source for the changes:"
msgstr ""
-msgid "Created at:"
+msgid "Enter a source"
msgstr ""
-msgid "Changeset comment:"
+msgid "Changeset id:"
+msgstr ""
+
+msgid "Created at:"
+msgstr ""
+
+msgid "Changeset comment:"
msgstr ""
msgid "No open changeset"
@@ -7431,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"
@@ -7507,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 ""
@@ -7522,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"
@@ -7738,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 "
@@ -7752,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 ""
@@ -7767,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 ""
@@ -7774,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 ..."
@@ -7887,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] ""
@@ -7899,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>"
@@ -7915,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:"
@@ -8061,7 +8170,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8091,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"
@@ -8450,9 +8559,6 @@ msgstr "מחלץ מיקומי GPS מ-EXIF"
msgid "Starting directory scan"
msgstr "מתחיל סריקת ספרייה"
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr "קורא תמונות..."
@@ -8471,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 "תמונות בעלות גאותגיות"
@@ -8528,6 +8637,12 @@ msgstr "הבאה"
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "מרכז תצוגה"
@@ -8598,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 ""
@@ -8783,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}''..."
@@ -8805,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"
@@ -8815,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:"
@@ -9036,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}''"
@@ -9751,6 +9858,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9819,6 +9959,9 @@ msgstr "צייר נקודות וירטואליות במצב הנבחר"
msgid "Draw inactive layers in other color"
msgstr "צייר שכבות לא פעילות בצבע שונה"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9872,6 +10015,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 ""
@@ -10328,6 +10476,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 ""
@@ -10391,7 +10545,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 ""
@@ -10649,40 +10803,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}''"
@@ -10735,8 +10889,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:"
@@ -10745,20 +10899,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 ""
@@ -10840,14 +10999,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"
@@ -10920,8 +11073,8 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
-msgstr "שנה תכונות"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -10999,9 +11152,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr "שגיאה בניתוח {0}: "
@@ -11020,6 +11170,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 ""
@@ -11049,9 +11207,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 ""
@@ -11082,7 +11280,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 ""
@@ -11122,28 +11320,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..."
@@ -11240,6 +11436,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 ""
@@ -11255,12 +11454,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}."
@@ -11339,8 +11546,8 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
-msgstr "יבוא NMEA הסתיים בהצלחה"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "יבוא NMEA נכשל!"
@@ -11438,35 +11645,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 ""
@@ -11476,8 +11659,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 ..."
@@ -11504,10 +11687,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>"
@@ -11591,8 +11771,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}."
@@ -11789,7 +11969,7 @@ 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}"
@@ -11835,6 +12015,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."
@@ -11865,19 +12054,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 ""
@@ -11899,11 +12088,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 ""
@@ -11973,13 +12174,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}''"
@@ -12122,10 +12323,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"
@@ -12140,22 +12341,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}''"
@@ -12224,8 +12424,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..."
@@ -12240,9 +12439,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}''"
@@ -12564,12 +12778,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12580,9 +12793,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 ""
@@ -12614,9 +12870,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."
@@ -12941,6 +13211,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 ""
@@ -13180,6 +13455,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."
@@ -13229,9 +13507,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 ""
@@ -13268,6 +13543,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 ""
@@ -13398,6 +13678,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "אגרה"
+
msgid "Motorway Link"
msgstr ""
@@ -13488,6 +13771,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 ""
@@ -13506,10 +13833,10 @@ msgstr ""
msgid "Service"
msgstr "שירות"
-msgid "Edit Serviceway"
-msgstr "ערוך דרך שירות"
+msgid "Edit Service Way"
+msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13521,6 +13848,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "מפרץ חנייה"
@@ -13548,18 +13878,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 "דרך ללא מוצא"
@@ -13569,9 +13893,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr "יעד"
-
msgid "delivery"
msgstr ""
@@ -13581,15 +13902,15 @@ msgstr ""
msgid "private"
msgstr "פרטי"
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr "חקלאי"
msgid "forestry"
msgstr ""
-msgid "no"
-msgstr "לא"
-
msgid "official"
msgstr ""
@@ -13635,6 +13956,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr "רכב ציבורי"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "מהירות מינימלית (קמ\"ש)"
@@ -13719,6 +14043,9 @@ msgstr "ערוך גשר"
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13823,21 +14150,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 ""
@@ -13853,10 +14189,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"
@@ -13892,7 +14228,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13961,12 +14297,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 "סוג מעבר חציה"
@@ -13982,15 +14324,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 ""
@@ -14012,6 +14345,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr "עצור"
@@ -14021,6 +14363,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -14030,10 +14375,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr "מעבר חציה"
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14066,9 +14408,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14108,8 +14447,20 @@ msgstr "מחסום"
msgid "Edit Block"
msgstr ""
-msgid "Allowed traffic:"
-msgstr "תנועה מותרת:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
msgid "Bollard"
msgstr ""
@@ -14126,6 +14477,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14195,19 +14549,16 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
-msgstr ""
-
-msgid "split_rail"
+msgid "pole"
msgstr ""
-msgid "chain"
+msgid "Guard Rail"
msgstr ""
-msgid "hedge"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14238,6 +14589,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14247,11 +14599,11 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
-msgstr "כניסה"
+msgid "Entrance (barrier opening)"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "ערוך כניסה"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "שער"
@@ -14304,12 +14656,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14370,12 +14716,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr "נחל"
msgid "Edit Stream"
msgstr "ערוך נחל"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "תעלה"
@@ -14415,9 +14770,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14451,6 +14803,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 "אדמה"
@@ -14532,18 +14899,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 ""
@@ -14619,7 +14991,7 @@ msgstr "תיירות"
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14643,10 +15015,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"
@@ -14658,9 +15033,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14712,6 +15084,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14724,18 +15099,32 @@ 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 ""
@@ -14835,11 +15224,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14851,11 +15238,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14874,12 +15259,12 @@ msgstr ""
msgid "underground"
msgstr ""
+msgid "rooftop"
+msgstr ""
+
msgid "Access"
msgstr "גישה"
-msgid "customers"
-msgstr ""
-
msgid "Park and Ride"
msgstr ""
@@ -14907,9 +15292,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14931,10 +15313,29 @@ 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"
@@ -15084,6 +15485,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15105,6 +15509,12 @@ msgstr "תיקונים"
msgid "Edit Car Repair"
msgstr "ערוך תיקוני רכבים"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15132,6 +15542,12 @@ msgstr "השכרה"
msgid "Edit Car Rental"
msgstr "ערוך השכרת רכב"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "שיתוף"
@@ -15156,22 +15572,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 ""
@@ -15193,9 +15593,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15390,6 +15787,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15420,6 +15820,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "ספסל"
@@ -15432,9 +15835,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15444,9 +15844,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr "מבנה"
@@ -15459,6 +15864,9 @@ msgstr "ערוך כניסת רכבת תחתית"
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15483,14 +15891,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15539,8 +15939,8 @@ msgstr ""
msgid "Taxi"
msgstr "מונית"
-msgid "Edit Taxi station"
-msgstr "ערוך תחנת מוניות"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "שדה תעופה"
@@ -15593,6 +15993,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 ""
@@ -15615,21 +16030,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 ""
@@ -15819,9 +16219,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr "תיירות"
@@ -15843,9 +16240,15 @@ msgstr "מגדל תצפית"
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "מפה"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15858,6 +16261,9 @@ msgstr "רחוב"
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15897,6 +16303,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15918,22 +16327,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"
@@ -16063,49 +16484,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"
@@ -16123,6 +16538,12 @@ msgstr "קתולי"
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16135,6 +16556,9 @@ msgstr "מתודיסט"
msgid "mormon"
msgstr "מורמוני"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "אורתודוקסי"
@@ -16153,37 +16577,137 @@ 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"
@@ -16273,6 +16797,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 "בריאות"
@@ -16354,12 +16884,66 @@ msgstr "וטרינרי"
msgid "Edit Veterinary"
msgstr "ערוך וטרינרי"
-msgid "Drinking water"
+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 "טלפון"
@@ -16369,6 +16953,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 ""
@@ -16378,31 +16986,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 ""
@@ -16430,8 +17044,8 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
-msgstr "ערוך תחנת מיחזור"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr ""
@@ -16457,21 +17071,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 "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16506,18 +17114,24 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
+
msgid "Hide"
msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
-msgstr "מי שתיה"
-
msgid "Edit Source of Potable Water"
msgstr ""
@@ -16549,6 +17163,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16586,119 +17203,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 "מרכז ספורט"
@@ -16730,26 +17383,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 ""
@@ -16757,6 +17411,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr "מרכז ספורט"
+
+msgid "stadium"
+msgstr "איצטדיון"
+
msgid "10pin"
msgstr ""
@@ -16790,6 +17453,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 "מירוץ כלבים"
@@ -16890,36 +17569,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 ""
@@ -16962,19 +17659,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 ""
@@ -17113,6 +17806,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 ""
@@ -17125,60 +17830,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 "מגדל"
@@ -17403,41 +18182,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"
@@ -17446,7 +18251,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17458,12 +18263,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 ""
@@ -17515,89 +18410,192 @@ 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 "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 "Edit Power Station"
-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 ""
@@ -17608,6 +18606,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 ""
@@ -17623,6 +18636,9 @@ msgstr "ערוך עמוד חשמל"
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17641,11 +18657,9 @@ msgstr "ערוך קו מתח"
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17754,11 +18768,11 @@ msgstr "קיוסק"
msgid "Edit Kiosk"
msgstr "ערוך קיוסק"
-msgid "Baker"
-msgstr "מאפייה"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "ערוך מאפייה"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "קצבייה"
@@ -17769,7 +18783,7 @@ msgstr "ערוך קצבייה"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17790,6 +18804,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17802,9 +18819,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17874,7 +18888,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17895,13 +18909,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"
@@ -17910,7 +18924,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17938,6 +18951,12 @@ msgstr "ערוך החלפת כסף"
msgid "Edit Automated Teller Machine"
msgstr "ערוך כספומט"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17974,10 +18993,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"
@@ -18007,7 +19047,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18019,19 +19059,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"
@@ -18067,7 +19107,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18280,6 +19320,12 @@ msgstr "פסגה"
msgid "Edit Peak"
msgstr "ערוך פסגה"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "קרחון"
@@ -18319,26 +19365,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 "יער"
@@ -18346,15 +19401,6 @@ msgstr "יער"
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr "מחטני"
-
-msgid "deciduous"
-msgstr "נשיר"
-
-msgid "mixed"
-msgstr "מעורב"
-
msgid "Grassland"
msgstr ""
@@ -18424,10 +19470,16 @@ msgstr "אדמה חקלאית"
msgid "Edit Farmland Landuse"
msgstr ""
-msgid "Meadow"
+msgid "Meadow"
+msgstr ""
+
+msgid "Edit Meadow Landuse"
+msgstr ""
+
+msgid "Orchard"
msgstr ""
-msgid "Edit Meadow Landuse"
+msgid "Edit Orchard Landuse"
msgstr ""
msgid "Vineyard"
@@ -18484,8 +19536,8 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
-msgstr "אזור מגורים"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr ""
@@ -18496,6 +19548,9 @@ msgstr "בית-קברות"
msgid "Edit Graveyard"
msgstr "ערוך בית-קברות"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "בית עלמין"
@@ -18571,6 +19626,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 "ערוך כתובת"
@@ -18607,6 +19689,18 @@ msgstr "זוגי"
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18775,21 +19869,50 @@ 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 "רגל"
+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 ""
@@ -18835,19 +19958,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"
@@ -18871,7 +19997,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18967,18 +20093,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 "סוס"
@@ -18988,7 +20123,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18997,10 +20135,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -19018,6 +20156,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19033,29 +20174,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 "תחנת כח"
@@ -19075,20 +20216,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 "מלון"
@@ -19162,10 +20303,13 @@ msgstr ""
msgid "boundary"
msgstr "גבול"
+msgid "sport"
+msgstr "ספורט"
+
msgid "place"
msgstr "מקום"
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19180,9 +20324,6 @@ msgstr "כפר\\עיר"
msgid "One Way"
msgstr "חד סטרי"
-msgid "Church"
-msgstr "כנסייה"
-
msgid "Fuel Station"
msgstr "תחנת דלק"
@@ -19210,6 +20351,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19255,10 +20399,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"
@@ -19270,7 +20444,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"
@@ -19288,7 +20462,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19405,19 +20579,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 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"
@@ -19436,7 +20721,46 @@ 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 "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 "Landsat"
@@ -19448,19 +20772,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 "skobbler heatmap"
@@ -19481,7 +20814,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19490,6 +20823,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19636,6 +20972,29 @@ 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 ""
@@ -19801,6 +21160,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19846,6 +21208,39 @@ msgstr ""
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 "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 ""
@@ -20047,6 +21442,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 ""
@@ -20068,13 +21475,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20337,10 +21738,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20544,7 +21948,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"
@@ -20815,15 +22219,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20994,6 +22389,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 ""
@@ -21012,12 +22410,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21153,6 +22545,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 ""
@@ -21170,6 +22565,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 ""
@@ -21396,7 +22794,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."
@@ -21446,7 +22847,7 @@ msgstr "מחק את הסכמה הנבחרת מהרשימה"
msgid "Color Schemes"
msgstr "סכמות צבעים"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21631,6 +23032,71 @@ msgstr ""
msgid "Show users on map"
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 "מיקום בלבד"
@@ -21670,27 +23136,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 "מייבא נתונים ממכשיר."
@@ -22771,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 ""
+
+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 ""
@@ -23420,9 +24885,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "אירעה שגיאה: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "לא יכול ליצור תקלה חדשה. תוצאה: {0}"
-
msgid "Process queue"
msgstr ""
@@ -23475,18 +24937,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 ""
@@ -23834,6 +25284,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23985,6 +25456,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 ""
@@ -24302,9 +25776,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24520,6 +25991,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 ""
@@ -24552,15 +26026,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 ""
@@ -24675,9 +26165,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24856,19 +26343,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"
@@ -25084,6 +26571,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 ""
@@ -25120,6 +26696,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..."
@@ -25272,9 +26851,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26260,9 +27836,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26541,9 +28114,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 6e28590..5c3f47a 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-08-04 03:41+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-08-05 04:45+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 ""
@@ -250,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr "जानकारी"
-
msgid "Align Nodes in Line"
msgstr ""
@@ -289,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr "जानकारी"
+
msgid "Zoom to {0}"
msgstr ""
@@ -343,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 ""
@@ -523,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -636,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 ""
@@ -786,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"
@@ -972,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 ""
@@ -995,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>"
@@ -1163,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1304,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"
@@ -1399,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 ""
@@ -1683,6 +1703,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1902,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] ""
@@ -2328,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 ""
@@ -2524,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 ""
@@ -2611,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 ""
@@ -2647,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"
@@ -2673,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}''"
@@ -2778,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] ""
@@ -2838,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"
@@ -2869,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"
@@ -2893,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 ""
@@ -2923,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 ""
@@ -2943,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 ""
@@ -2952,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 ""
@@ -2972,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}"
@@ -3003,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}''."
@@ -3160,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 ""
@@ -3268,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 ""
@@ -3306,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3347,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3371,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 ""
@@ -3430,6 +3469,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3512,6 +3554,15 @@ 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 ""
@@ -3581,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 ""
@@ -3638,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})"
@@ -3676,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}"
@@ -3813,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"
@@ -3888,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 ""
@@ -3918,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3945,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''"
@@ -4011,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 ""
@@ -4131,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"
@@ -4360,6 +4400,18 @@ 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 ""
@@ -4464,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 ""
@@ -4764,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"
@@ -4801,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"
@@ -4853,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 ""
@@ -5110,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 ""
@@ -5638,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5721,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 ""
@@ -5811,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 ""
@@ -5982,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 ""
@@ -6269,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"
@@ -6335,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"
@@ -6377,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)"
@@ -6537,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"
@@ -6855,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 ""
@@ -6986,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 ""
@@ -7010,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 ""
@@ -7123,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."
@@ -7222,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7309,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"
@@ -7328,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 ""
@@ -7394,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"
@@ -7470,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 ""
@@ -7485,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"
@@ -7701,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 "
@@ -7715,13 +7795,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7730,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 ""
@@ -7737,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 ..."
@@ -7850,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] ""
@@ -7862,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>"
@@ -7878,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:"
@@ -8024,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8054,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"
@@ -8407,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8428,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 ""
@@ -8485,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8551,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 ""
@@ -8734,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}''..."
@@ -8756,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"
@@ -8766,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:"
@@ -8987,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}''"
@@ -9702,6 +9811,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9770,6 +9912,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9823,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 ""
@@ -10279,6 +10429,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 ""
@@ -10342,7 +10498,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 ""
@@ -10600,40 +10756,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}''"
@@ -10686,8 +10842,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:"
@@ -10696,20 +10852,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 ""
@@ -10791,14 +10952,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,7 +11026,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10950,9 +11105,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10971,6 +11123,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 ""
@@ -11000,9 +11160,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 ""
@@ -11033,7 +11233,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 ""
@@ -11073,28 +11273,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..."
@@ -11189,6 +11387,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11204,12 +11405,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}."
@@ -11288,7 +11497,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11387,35 +11596,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 ""
@@ -11425,8 +11610,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 ..."
@@ -11453,10 +11638,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>"
@@ -11540,8 +11722,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}."
@@ -11738,7 +11920,7 @@ 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}"
@@ -11784,6 +11966,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."
@@ -11814,19 +12005,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 ""
@@ -11848,11 +12039,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 ""
@@ -11922,13 +12125,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}''"
@@ -12071,10 +12274,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"
@@ -12089,22 +12292,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}''"
@@ -12173,8 +12375,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..."
@@ -12189,9 +12390,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}''"
@@ -12513,12 +12729,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12529,30 +12744,73 @@ 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 "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] ""
+
+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"
@@ -12563,9 +12821,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."
@@ -12888,6 +13160,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 ""
@@ -13127,6 +13404,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."
@@ -13176,9 +13456,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 ""
@@ -13215,6 +13492,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 ""
@@ -13345,6 +13627,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13435,6 +13720,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 ""
@@ -13453,10 +13782,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 +13797,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13495,18 +13827,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 ""
@@ -13516,9 +13842,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13528,13 +13851,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13582,6 +13905,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13666,6 +13992,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13770,21 +14099,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 ""
@@ -13800,10 +14138,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"
@@ -13839,7 +14177,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13908,12 +14246,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 ""
@@ -13929,15 +14273,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 ""
@@ -13959,6 +14294,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13968,6 +14312,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13977,10 +14324,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14013,9 +14357,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14058,6 +14399,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14073,6 +14420,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14142,19 +14492,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14185,6 +14529,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14194,10 +14539,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14251,12 +14596,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14317,12 +14656,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14362,9 +14710,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14398,6 +14743,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 ""
@@ -14479,18 +14839,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 ""
@@ -14566,7 +14931,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14590,10 +14955,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"
@@ -14605,9 +14973,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14659,6 +15024,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14671,6 +15039,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14782,11 +15185,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14798,11 +15199,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14821,10 +15220,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14854,9 +15253,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14878,10 +15274,29 @@ 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"
@@ -15031,6 +15446,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15052,6 +15470,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15079,6 +15503,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15103,22 +15533,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 ""
@@ -15140,9 +15554,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15337,6 +15748,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15367,6 +15781,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15379,9 +15796,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15391,9 +15805,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15406,6 +15825,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15430,14 +15852,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15486,7 +15900,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15540,41 +15954,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"
@@ -15766,9 +16180,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15790,9 +16201,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15805,6 +16222,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15844,6 +16264,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15865,22 +16288,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"
@@ -16010,49 +16445,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"
@@ -16070,6 +16499,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16082,6 +16517,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16100,37 +16538,137 @@ 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"
@@ -16220,6 +16758,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 ""
@@ -16301,128 +16845,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16453,16 +17075,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16496,6 +17124,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16533,117 +17164,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 ""
@@ -16677,33 +17344,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 ""
@@ -16737,6 +17414,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 ""
@@ -16837,36 +17530,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 ""
@@ -16909,19 +17620,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 ""
@@ -17060,6 +17767,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 ""
@@ -17072,60 +17791,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 ""
@@ -17350,41 +18143,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"
@@ -17393,7 +18212,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17405,12 +18224,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 ""
@@ -17462,88 +18371,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17555,6 +18567,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 ""
@@ -17570,6 +18597,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17588,11 +18618,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17701,10 +18729,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17716,7 +18744,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17737,6 +18765,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17749,9 +18780,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17821,7 +18849,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17842,13 +18870,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"
@@ -17857,7 +18885,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17885,6 +18912,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17921,10 +18954,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"
@@ -17954,7 +19008,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17966,19 +19020,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"
@@ -18014,7 +19068,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18227,6 +19281,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18266,24 +19326,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 ""
@@ -18293,15 +19362,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18377,6 +19437,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18431,7 +19497,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18443,6 +19509,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18479,43 +19548,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18554,6 +19650,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18722,21 +19830,50 @@ 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 ""
+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 ""
@@ -18782,19 +19919,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"
@@ -18818,7 +19958,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18914,18 +20054,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 ""
@@ -18935,7 +20084,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18944,10 +20096,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18965,6 +20117,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18980,28 +20135,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"
@@ -19022,19 +20177,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"
@@ -19109,10 +20264,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19127,9 +20285,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19157,6 +20312,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19202,10 +20360,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"
@@ -19217,7 +20405,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"
@@ -19235,7 +20423,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19352,19 +20540,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 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"
@@ -19383,7 +20682,46 @@ 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 "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 "Landsat"
@@ -19395,19 +20733,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 "skobbler heatmap"
@@ -19428,7 +20775,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19437,6 +20784,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19583,6 +20933,29 @@ 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 ""
@@ -19748,6 +21121,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19793,6 +21169,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19979,19 +21388,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20015,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}''."
@@ -20284,10 +21699,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20491,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"
@@ -20762,15 +22180,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20941,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 ""
@@ -20959,12 +22371,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21100,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 ""
@@ -21117,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 ""
@@ -21343,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."
@@ -21393,7 +22808,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21578,6 +22993,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21617,27 +23097,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 ""
@@ -22715,9 +24177,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 ""
@@ -23364,9 +24843,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23419,18 +24895,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 ""
@@ -23777,6 +25241,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23928,6 +25413,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 ""
@@ -24245,9 +25733,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24463,6 +25948,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 ""
@@ -24495,15 +25983,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 ""
@@ -24618,9 +26122,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24799,19 +26300,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"
@@ -25027,6 +26528,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 ""
@@ -25063,6 +26653,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..."
@@ -25215,9 +26808,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26203,9 +27793,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26484,9 +28071,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 b8ceb94..3a52fda 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-08-04 03:41+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-08-05 04:58+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ 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 ""
@@ -60,6 +63,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -164,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 "
@@ -267,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"
@@ -306,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}"
@@ -362,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"
@@ -549,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)"
@@ -672,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"
@@ -824,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"
@@ -1032,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 ""
@@ -1058,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>"
@@ -1238,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"
@@ -1396,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"
@@ -1506,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"
@@ -1794,6 +1801,9 @@ 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)"
@@ -2016,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 ""
@@ -2453,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"
@@ -2649,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 "
@@ -2741,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}"
@@ -2777,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"
@@ -2806,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}''"
@@ -2923,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"
@@ -2985,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"
@@ -3016,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"
@@ -3040,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 ""
@@ -3070,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 ""
@@ -3090,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 ""
@@ -3099,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 ""
@@ -3119,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}"
@@ -3150,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}''."
@@ -3310,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 ""
@@ -3418,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 ""
@@ -3456,9 +3468,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr "WGS84"
@@ -3497,6 +3506,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3521,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 ""
@@ -3580,6 +3601,9 @@ msgstr " ili "
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3662,6 +3686,15 @@ 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 ""
@@ -3731,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 ""
@@ -3788,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})"
@@ -3826,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}"
@@ -3963,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"
@@ -4038,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 ""
@@ -4068,9 +4110,6 @@ msgstr "zgrada"
msgid "area"
msgstr "površina"
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -4095,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''"
@@ -4161,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 ""
@@ -4281,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"
@@ -4510,6 +4532,18 @@ 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 ""
@@ -4614,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)"
@@ -4914,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"
@@ -4951,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"
@@ -5003,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"
@@ -5263,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 ""
@@ -5792,6 +5823,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5875,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"
@@ -5966,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 ""
@@ -6137,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 ""
@@ -6424,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"
@@ -6490,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 "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 "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"
@@ -6532,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)"
@@ -6694,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"
@@ -7013,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 ""
@@ -7144,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, "
@@ -7168,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 ""
@@ -7286,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."
@@ -7385,6 +7444,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7484,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"
@@ -7503,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 ""
@@ -7569,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"
@@ -7645,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 ""
@@ -7660,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"
@@ -7877,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 "
@@ -7891,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 ""
@@ -7906,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 ""
@@ -7913,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 ..."
@@ -8026,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..."
@@ -8039,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>"
@@ -8055,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:"
@@ -8206,7 +8297,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8236,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"
@@ -8592,9 +8683,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8613,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 ""
@@ -8671,6 +8762,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8737,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 ""
@@ -8920,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}''..."
@@ -8942,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"
@@ -8952,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:"
@@ -9173,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}''"
@@ -9888,6 +9977,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9956,6 +10078,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -10009,6 +10134,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 ""
@@ -10465,6 +10595,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 ""
@@ -10528,7 +10664,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 ""
@@ -10786,40 +10922,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}''"
@@ -10872,8 +11008,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:"
@@ -10882,20 +11018,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 ""
@@ -10977,14 +11118,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"
@@ -11057,7 +11192,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -11136,9 +11271,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -11157,6 +11289,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 ""
@@ -11186,9 +11326,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 ""
@@ -11219,7 +11399,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 ""
@@ -11259,28 +11439,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..."
@@ -11375,6 +11553,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11390,12 +11571,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}."
@@ -11474,7 +11663,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11573,35 +11762,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 ""
@@ -11611,8 +11776,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 ..."
@@ -11639,10 +11804,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>"
@@ -11726,8 +11888,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}."
@@ -11924,7 +12086,7 @@ 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}"
@@ -11970,6 +12132,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."
@@ -12000,19 +12171,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 ""
@@ -12034,11 +12205,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 ""
@@ -12108,13 +12291,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}''"
@@ -12257,10 +12440,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"
@@ -12275,22 +12458,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}''"
@@ -12359,8 +12541,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..."
@@ -12375,9 +12556,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}''"
@@ -12699,12 +12895,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12715,13 +12910,56 @@ 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 "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 ""
+
+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] ""
@@ -12749,9 +12987,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."
@@ -13074,6 +13326,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 ""
@@ -13313,6 +13570,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."
@@ -13362,9 +13622,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 ""
@@ -13401,6 +13658,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 ""
@@ -13531,6 +13793,9 @@ msgstr "Nasip"
msgid "Lit"
msgstr "Rasvjeta"
+msgid "Toll"
+msgstr "Cestarina (Toll)"
+
msgid "Motorway Link"
msgstr "Spojna cesta autocesti"
@@ -13621,6 +13886,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"
@@ -13639,10 +13948,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13654,6 +13963,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13681,18 +13993,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"
@@ -13702,9 +14008,6 @@ msgstr ""
msgid "General Access"
msgstr "Opći pristup"
-msgid "destination"
-msgstr "destinacija (odredište)"
-
msgid "delivery"
msgstr "Dostava"
@@ -13714,15 +14017,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"
@@ -13768,6 +14071,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Min. brzina (km/h)"
@@ -13852,6 +14158,9 @@ msgstr "Uredi most"
msgid "viaduct"
msgstr "vijadukt"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13956,20 +14265,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"
@@ -13986,11 +14304,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"
@@ -14025,8 +14343,8 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
-msgstr "Uredi cestu"
+msgid "Edit Highway Attributes:"
+msgstr ""
msgid "Highway"
msgstr "Cesta"
@@ -14094,12 +14412,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"
@@ -14115,15 +14439,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 ""
@@ -14145,6 +14460,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"
@@ -14154,6 +14478,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Mali kružni tok (rotor)"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Smjer"
@@ -14163,10 +14490,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"
@@ -14199,9 +14523,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14241,7 +14562,19 @@ msgstr ""
msgid "Edit Block"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
msgstr ""
msgid "Bollard"
@@ -14259,6 +14592,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr "Biciklistička prepreka (Cycle Barrier)"
@@ -14328,19 +14664,16 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
-msgstr ""
-
-msgid "split_rail"
+msgid "pole"
msgstr ""
-msgid "chain"
+msgid "Guard Rail"
msgstr ""
-msgid "hedge"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14371,6 +14704,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14380,10 +14714,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14437,12 +14771,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14503,12 +14831,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14548,9 +14885,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14584,6 +14918,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 ""
@@ -14665,18 +15014,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 ""
@@ -14752,7 +15106,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14776,10 +15130,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"
@@ -14791,9 +15148,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14845,6 +15199,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14857,18 +15214,32 @@ 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 ""
@@ -14968,11 +15339,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14984,11 +15353,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -15007,10 +15374,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -15040,9 +15407,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -15064,10 +15428,29 @@ 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"
@@ -15217,6 +15600,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15238,6 +15624,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15265,6 +15657,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15289,22 +15687,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 ""
@@ -15326,9 +15708,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15523,6 +15902,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15553,6 +15935,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15565,9 +15950,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15577,9 +15959,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15592,6 +15979,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15616,14 +16006,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15672,7 +16054,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15726,41 +16108,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"
@@ -15952,9 +16334,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15976,9 +16355,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15991,6 +16376,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -16030,6 +16418,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -16051,22 +16442,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"
@@ -16196,49 +16599,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"
@@ -16256,6 +16653,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16268,6 +16671,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16286,37 +16692,137 @@ 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"
@@ -16406,6 +16912,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 ""
@@ -16487,12 +16999,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+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 ""
@@ -16502,6 +17068,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 ""
@@ -16511,31 +17101,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 ""
@@ -16563,7 +17159,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16590,21 +17186,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 "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16639,16 +17229,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16682,6 +17278,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16719,117 +17318,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 ""
@@ -16863,33 +17498,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 ""
@@ -16923,6 +17568,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 ""
@@ -17023,36 +17684,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 ""
@@ -17095,19 +17774,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 ""
@@ -17246,6 +17921,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 ""
@@ -17258,60 +17945,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 ""
@@ -17536,41 +18297,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"
@@ -17579,7 +18366,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17591,12 +18378,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 ""
@@ -17648,97 +18525,215 @@ 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 "battery charging"
+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 "Power Station"
+msgid "high"
msgstr ""
-msgid "Edit Power Station"
+msgid "medium"
msgstr ""
-msgid "Power Sub Station"
+msgid "low"
msgstr ""
-msgid "Edit Power Sub Station"
+msgid "750000;200000"
msgstr ""
-msgid "Line reference"
+msgid "110000;20000"
msgstr ""
msgid "Cable Distribution Cabinet"
@@ -17756,6 +18751,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17774,11 +18772,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17887,10 +18883,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17902,7 +18898,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17923,6 +18919,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17935,9 +18934,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -18007,7 +19003,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -18028,13 +19024,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"
@@ -18043,7 +19039,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -18071,6 +19066,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -18107,10 +19108,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"
@@ -18140,7 +19162,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18152,19 +19174,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"
@@ -18200,7 +19222,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18413,6 +19435,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18452,24 +19480,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 ""
@@ -18479,15 +19516,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18563,6 +19591,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18617,7 +19651,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18629,6 +19663,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18704,6 +19741,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 ""
@@ -18740,6 +19804,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18908,21 +19984,50 @@ 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 ""
+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 ""
@@ -18968,19 +20073,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"
@@ -19004,7 +20112,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -19100,18 +20208,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 ""
@@ -19121,7 +20238,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -19130,10 +20250,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -19151,6 +20271,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19166,28 +20289,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"
@@ -19208,19 +20331,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"
@@ -19295,10 +20418,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19313,9 +20439,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19343,6 +20466,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19388,10 +20514,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"
@@ -19403,7 +20559,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"
@@ -19421,7 +20577,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19538,19 +20694,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 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"
@@ -19565,11 +20832,50 @@ msgstr ""
msgid "unknown jewish denomination"
msgstr ""
-msgid ""
-"no wikipedia-language given, use ''wikipedia''=''language:page title''"
+msgid ""
+"no wikipedia-language given, use ''wikipedia''=''language:page title''"
+msgstr ""
+
+msgid "unknown language prefix in wikipedia tag"
+msgstr ""
+
+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 "unkown language prefix in wikipedia tag"
+msgid "unusual incline; use percentages/degrees or up/down"
msgstr ""
msgid "Landsat"
@@ -19581,19 +20887,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 "skobbler heatmap"
@@ -19614,7 +20929,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19623,6 +20938,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19769,6 +21087,29 @@ 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 ""
@@ -19934,6 +21275,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19979,6 +21323,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -20180,6 +21557,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 ""
@@ -20201,13 +21590,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20470,10 +21853,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20677,7 +22063,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"
@@ -20948,15 +22334,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -21127,6 +22504,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 ""
@@ -21145,12 +22525,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21286,6 +22660,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 ""
@@ -21303,6 +22680,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 ""
@@ -21529,7 +22909,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."
@@ -21579,7 +22962,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21803,27 +23186,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 ""
@@ -22901,9 +24266,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 ""
@@ -23550,9 +24936,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23605,18 +24988,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 ""
@@ -23963,6 +25334,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -24114,6 +25506,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 ""
@@ -24431,9 +25826,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24649,6 +26041,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 ""
@@ -24681,15 +26076,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 ""
@@ -24804,9 +26215,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr "Tip ceste"
-
msgid "Speed (Km/h)"
msgstr "Brzina (Km/h)"
@@ -24985,19 +26393,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"
@@ -25213,6 +26621,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"
@@ -25249,6 +26746,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..."
@@ -25401,9 +26901,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26391,9 +27888,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26672,9 +28166,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 a561bc8..0ead433 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-08-04 03:41+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-08-05 04:44+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 ""
@@ -250,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -289,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -343,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 ""
@@ -523,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -636,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 ""
@@ -786,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"
@@ -972,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 ""
@@ -995,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>"
@@ -1163,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1304,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"
@@ -1399,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 ""
@@ -1683,6 +1703,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1902,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] ""
@@ -2328,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 ""
@@ -2524,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 ""
@@ -2611,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 ""
@@ -2647,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"
@@ -2673,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}''"
@@ -2778,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] ""
@@ -2838,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"
@@ -2869,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"
@@ -2893,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 ""
@@ -2923,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 ""
@@ -2943,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 ""
@@ -2952,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 ""
@@ -2972,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}"
@@ -3003,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}''."
@@ -3160,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 ""
@@ -3268,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 ""
@@ -3306,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3347,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3371,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 ""
@@ -3430,6 +3469,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3512,6 +3554,15 @@ 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 ""
@@ -3581,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 ""
@@ -3638,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})"
@@ -3676,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}"
@@ -3813,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"
@@ -3888,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 ""
@@ -3918,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3945,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''"
@@ -4011,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 ""
@@ -4131,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"
@@ -4360,6 +4400,18 @@ 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 ""
@@ -4464,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 ""
@@ -4764,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"
@@ -4801,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"
@@ -4853,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 ""
@@ -5110,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 ""
@@ -5638,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5721,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 ""
@@ -5811,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 ""
@@ -5982,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 ""
@@ -6269,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"
@@ -6335,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"
@@ -6377,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)"
@@ -6537,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"
@@ -6855,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 ""
@@ -6986,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 ""
@@ -7010,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 ""
@@ -7123,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."
@@ -7222,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7309,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"
@@ -7328,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 ""
@@ -7394,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"
@@ -7470,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 ""
@@ -7485,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"
@@ -7701,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 "
@@ -7715,13 +7795,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7730,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 ""
@@ -7737,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 ..."
@@ -7850,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] ""
@@ -7862,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>"
@@ -7878,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:"
@@ -8024,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8054,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"
@@ -8407,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8428,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 ""
@@ -8485,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8551,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 ""
@@ -8734,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}''..."
@@ -8756,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"
@@ -8766,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:"
@@ -8987,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}''"
@@ -9702,6 +9811,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9770,6 +9912,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9823,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 ""
@@ -10279,6 +10429,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 ""
@@ -10342,7 +10498,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 ""
@@ -10600,40 +10756,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}''"
@@ -10686,8 +10842,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:"
@@ -10696,20 +10852,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 ""
@@ -10791,14 +10952,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,7 +11026,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10950,9 +11105,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10971,6 +11123,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 ""
@@ -11000,9 +11160,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 ""
@@ -11033,7 +11233,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 ""
@@ -11073,28 +11273,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..."
@@ -11189,6 +11387,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11204,12 +11405,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}."
@@ -11288,7 +11497,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11387,35 +11596,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 ""
@@ -11425,8 +11610,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 ..."
@@ -11453,10 +11638,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>"
@@ -11540,8 +11722,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}."
@@ -11738,7 +11920,7 @@ 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}"
@@ -11784,6 +11966,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."
@@ -11814,19 +12005,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 ""
@@ -11848,11 +12039,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 ""
@@ -11922,13 +12125,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}''"
@@ -12071,10 +12274,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"
@@ -12089,22 +12292,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}''"
@@ -12173,8 +12375,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..."
@@ -12189,9 +12390,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}''"
@@ -12513,12 +12729,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12529,30 +12744,73 @@ 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 "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] ""
+
+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"
@@ -12563,9 +12821,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."
@@ -12888,6 +13160,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 ""
@@ -13127,6 +13404,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."
@@ -13176,9 +13456,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 ""
@@ -13215,6 +13492,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 ""
@@ -13345,6 +13627,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13435,6 +13720,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 ""
@@ -13453,10 +13782,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 +13797,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13495,18 +13827,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 ""
@@ -13516,9 +13842,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13528,13 +13851,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13582,6 +13905,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13666,6 +13992,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13770,21 +14099,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 ""
@@ -13800,10 +14138,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"
@@ -13839,7 +14177,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13908,12 +14246,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 ""
@@ -13929,15 +14273,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 ""
@@ -13959,6 +14294,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13968,6 +14312,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13977,10 +14324,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14013,9 +14357,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14058,6 +14399,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14073,6 +14420,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14142,19 +14492,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14185,6 +14529,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14194,10 +14539,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14251,12 +14596,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14317,12 +14656,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14362,9 +14710,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14398,6 +14743,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 ""
@@ -14479,18 +14839,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 ""
@@ -14566,7 +14931,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14590,10 +14955,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"
@@ -14605,9 +14973,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14659,6 +15024,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14671,6 +15039,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14782,11 +15185,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14798,11 +15199,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14821,10 +15220,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14854,9 +15253,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14878,10 +15274,29 @@ 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"
@@ -15031,6 +15446,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15052,6 +15470,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15079,6 +15503,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15103,22 +15533,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 ""
@@ -15140,9 +15554,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15337,6 +15748,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15367,6 +15781,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15379,9 +15796,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15391,9 +15805,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15406,6 +15825,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15430,14 +15852,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15486,7 +15900,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15540,41 +15954,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"
@@ -15766,9 +16180,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15790,9 +16201,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15805,6 +16222,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15844,6 +16264,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15865,22 +16288,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"
@@ -16010,49 +16445,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"
@@ -16070,6 +16499,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16082,6 +16517,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16100,37 +16538,137 @@ 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"
@@ -16220,6 +16758,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 ""
@@ -16301,128 +16845,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16453,16 +17075,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16496,6 +17124,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16533,117 +17164,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 ""
@@ -16677,33 +17344,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 ""
@@ -16737,6 +17414,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 ""
@@ -16837,36 +17530,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 ""
@@ -16909,19 +17620,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 ""
@@ -17060,6 +17767,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 ""
@@ -17072,60 +17791,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 ""
@@ -17350,41 +18143,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"
@@ -17393,7 +18212,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17405,12 +18224,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 ""
@@ -17462,88 +18371,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17555,6 +18567,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 ""
@@ -17570,6 +18597,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17588,11 +18618,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17701,10 +18729,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17716,7 +18744,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17737,6 +18765,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17749,9 +18780,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17821,7 +18849,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17842,13 +18870,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"
@@ -17857,7 +18885,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17885,6 +18912,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17921,10 +18954,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"
@@ -17954,7 +19008,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17966,19 +19020,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"
@@ -18014,7 +19068,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18227,6 +19281,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18266,24 +19326,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 ""
@@ -18293,15 +19362,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18377,6 +19437,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18431,7 +19497,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18443,6 +19509,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18479,43 +19548,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18554,6 +19650,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18722,21 +19830,50 @@ 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 ""
+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 ""
@@ -18782,19 +19919,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"
@@ -18818,7 +19958,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18914,18 +20054,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 ""
@@ -18935,7 +20084,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18944,10 +20096,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18965,6 +20117,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18980,28 +20135,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"
@@ -19022,19 +20177,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"
@@ -19109,10 +20264,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19127,9 +20285,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19157,6 +20312,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19202,10 +20360,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"
@@ -19217,7 +20405,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"
@@ -19235,7 +20423,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19352,19 +20540,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 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"
@@ -19383,7 +20682,46 @@ 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 "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 "Landsat"
@@ -19395,19 +20733,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 "skobbler heatmap"
@@ -19428,7 +20775,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19437,6 +20784,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19583,6 +20933,29 @@ 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 ""
@@ -19748,6 +21121,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19793,6 +21169,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19979,19 +21388,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20015,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}''."
@@ -20284,10 +21699,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20491,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"
@@ -20762,15 +22180,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20941,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 ""
@@ -20959,12 +22371,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21100,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 ""
@@ -21117,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 ""
@@ -21343,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."
@@ -21393,7 +22808,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21578,6 +22993,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21617,27 +23097,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 ""
@@ -22715,9 +24177,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 ""
@@ -23364,9 +24843,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23419,18 +24895,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 ""
@@ -23777,6 +25241,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23928,6 +25413,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 ""
@@ -24245,9 +25733,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24463,6 +25948,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 ""
@@ -24495,15 +25983,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 ""
@@ -24618,9 +26122,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24799,19 +26300,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"
@@ -25027,6 +26528,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 ""
@@ -25063,6 +26653,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..."
@@ -25215,9 +26808,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26203,9 +27793,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26484,9 +28071,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 8132256..12360a7 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-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-08-08 22:59+0000\n"
-"Last-Translator: Ferenc Veres <Unknown>\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-08-10 04:34+0000\n"
-"X-Generator: Launchpad (build 16723)\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,9 @@ 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}"
@@ -59,6 +62,9 @@ msgstr "INFO: {0}"
msgid "DEBUG: {0}"
msgstr "DEBUG: {0}"
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Platform indítása"
@@ -162,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 "
@@ -223,7 +227,7 @@ msgid "Add imagery layer {0}"
msgstr "Légifelvétel réteg hozzáadása: {0}"
msgid "Select image format for WMS layer"
-msgstr ""
+msgstr "Válassz képformátumot a WMS réteghez"
msgid "Select WMS layers"
msgstr "Válassz WMS réteget"
@@ -265,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"
@@ -304,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}"
@@ -360,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"
@@ -434,7 +437,7 @@ 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 ""
+msgstr "{0} null-koordinátájú pont mellőzése"
msgid "Download from OSM..."
msgstr "Letöltés OSM-ről..."
@@ -552,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)"
@@ -676,11 +682,11 @@ 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"
@@ -850,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"
@@ -1024,6 +1030,8 @@ msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
msgstr ""
+"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 "
@@ -1055,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 "
@@ -1084,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>"
@@ -1271,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"
@@ -1424,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"
@@ -1450,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"
@@ -1537,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"
@@ -1767,7 +1787,7 @@ msgid "Slower Forward"
msgstr "Lassabban előre"
msgid "Download GPS"
-msgstr ""
+msgstr "GPS letöltése"
msgid "Downloading GPS data"
msgstr "GPS adatok letöltése"
@@ -1779,16 +1799,16 @@ msgid "Markers from {0}"
msgstr "Jelölők innen: {0}"
msgid "Download Compressed OSM Change"
-msgstr ""
+msgstr "Tömörített OSM Change letöltése"
msgid "Download OSM Change"
-msgstr ""
+msgstr "OSM Change letöltése"
msgid "Download Compressed OSM"
-msgstr ""
+msgstr "Tömörített OSM letöltése"
msgid "Download OSM"
-msgstr ""
+msgstr "OSM letöltése"
msgid "Downloading data"
msgstr "Adatok letöltése"
@@ -1812,7 +1832,7 @@ msgid "Request details: {0}"
msgstr "Kérés adatai: {0}"
msgid "Download OSM URL"
-msgstr ""
+msgstr "OSM URL letöltése"
msgid "There was {0} conflict during import."
msgid_plural "There were {0} conflicts during import."
@@ -1833,6 +1853,9 @@ 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)"
@@ -1981,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"
@@ -2045,7 +2068,7 @@ msgid "Improve Way Accuracy mode"
msgstr "Vonalpontosság növelő mód"
msgid "improve way accuracy helper line"
-msgstr ""
+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"
@@ -2077,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"
@@ -2095,7 +2118,7 @@ msgid "Make parallel copies of ways"
msgstr "Párhuzamos vonalak készítése"
msgid "make parallel helper line"
-msgstr ""
+msgstr "párhuzamos készítő segédvonal"
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
@@ -2559,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"
@@ -2738,13 +2764,13 @@ msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr "Hiányzó <i>min</i>/<i>max</i> ''timestamp'' után"
msgid "Range of primitive ids expected"
-msgstr ""
+msgstr "Elemazonosító tartományok szükségesek"
msgid "Range of changeset ids expected"
-msgstr ""
+msgstr "Módosításcsomag-azonosító tartományok szükségesek"
msgid "Range of versions expected"
-msgstr ""
+msgstr "Verzió tartományok szükségesek"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2776,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 "
@@ -2875,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"
@@ -2911,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}''"
@@ -2939,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}''"
@@ -3056,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"
@@ -3122,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"
@@ -3155,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:"
@@ -3179,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}"
@@ -3212,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 "
@@ -3237,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 "
@@ -3279,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}"
@@ -3312,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."
@@ -3481,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."
@@ -3597,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)"
@@ -3637,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"
@@ -3675,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"
@@ -3704,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"
@@ -3765,6 +3800,9 @@ 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"
@@ -3846,11 +3884,20 @@ msgid "Highways"
msgstr "Közutak"
msgid "Performs semantic checks on highways."
-msgstr ""
+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"
@@ -3923,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"
@@ -3983,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})"
@@ -4024,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}"
@@ -4169,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"
@@ -4245,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}"
@@ -4275,9 +4332,6 @@ msgstr "épület"
msgid "area"
msgstr "terület"
-msgid "Unclosed way"
-msgstr "Bezáratlan vonal"
-
msgid "Unconnected ways"
msgstr "Összekapcsolatlan vonalak"
@@ -4305,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"
@@ -4371,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)"
@@ -4494,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ő"
@@ -4741,8 +4775,20 @@ 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 "Audio"
+msgstr "Hang"
msgid "Do not hide toolbar"
msgstr "Ne rejtse el az eszköztárat"
@@ -4847,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)"
@@ -5173,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."
@@ -5180,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."
@@ -5187,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."
@@ -5202,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"
@@ -5218,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"
@@ -5274,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"
@@ -5351,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"
@@ -5472,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."
@@ -5553,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 "
@@ -6144,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"
@@ -6227,6 +6271,38 @@ msgstr "A stílus pillanatnyilag aktív?"
msgid "No"
msgstr "Nem"
+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 ""
+"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"
@@ -6318,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 "
@@ -6499,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"
@@ -6832,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 ""
@@ -6907,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"
@@ -6949,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)"
@@ -7068,13 +7151,13 @@ msgid "Recently added tags"
msgstr "Nemrég használt címkék"
msgid "Choose recent tag {0}"
-msgstr ""
+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 ""
+msgstr "Korábbi {0} címke alkalmazása"
msgid "The key ''{0}'' is already used"
msgstr "''{0}'' kulcs már használatban van"
@@ -7115,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"
@@ -7183,6 +7266,7 @@ 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 "
@@ -7474,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"
@@ -7622,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, "
@@ -7648,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"
@@ -7784,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."
@@ -7897,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"
@@ -8009,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"
@@ -8032,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ó:"
@@ -8102,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"
@@ -8188,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 "
@@ -8208,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"
@@ -8460,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 "
@@ -8480,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"
@@ -8495,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"
@@ -8502,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 ..."
@@ -8642,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..."
@@ -8656,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>"
@@ -8676,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:"
@@ -8831,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"
@@ -8864,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"
@@ -8986,7 +9097,7 @@ 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 ""
+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"
@@ -9027,7 +9138,7 @@ msgid "Alpha channel"
msgstr "Alfa csatorna"
msgid "Automatically change resolution"
-msgstr ""
+msgstr "Automatikus felbontás váltás"
msgid "Set WMS Bookmark"
msgstr "WMS könyvjelző beállítása"
@@ -9241,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..."
@@ -9262,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"
@@ -9321,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)"
@@ -9403,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"
@@ -9600,22 +9714,17 @@ msgid "Unable to create new audio marker."
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 "(Az URL: "
-msgid "Error displaying URL"
-msgstr ""
-
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 ""
-"Figyelmeztetés: hiba történt a Térképrajz stílus betöltésekor: \"{0}\". A "
-"hiba: {1}"
+"Nem sikerült betölteni a térképstílusokat innen: \"{0}\". Kivétel: {1}"
msgid "loading style ''{0}''..."
msgstr "stílus betöltése: ''{0}''..."
@@ -9633,23 +9742,19 @@ 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 ""
-"Figyelmeztetés: nem sikerült értelmezni a Térképrajz stílusokat a \"{0}\" "
-"fájlból. A hiba: {1}"
+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 ""
-"Figyelmeztetés: nem sikerült értelmezni a Térképrajz stílusokat a \"{0}\" "
-"fájlból. A hiba: [{1}:{2}] {3}"
+"Nem sikerült értelmezni a térképstílusokat itt: \"{0}\". Hiba: [{1}:{2}] {3}"
msgid "Access Token Key:"
msgstr "Elérési token kulcs:"
@@ -9671,10 +9776,10 @@ msgid "Use default settings"
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 "Kérelmi Token URL:"
@@ -9915,9 +10020,8 @@ msgstr "Bezárja az ablakot az azonosítás megszakításával"
msgid "Close the dialog and accept the Access Token"
msgstr "Bezárja az ablakot az Elérési Token elfogadásával"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr ""
-"Figyelmeztetés: nem sikerült a folyamatban lévő OAuth művelet megszakítása"
+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 "Az OAuth Kérelmi Token fogadása innen: \"{0}\""
@@ -10157,13 +10261,13 @@ msgid "Retrieving user info..."
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 ""
@@ -10172,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 "
@@ -10200,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 "
@@ -10219,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 "
@@ -10238,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."
@@ -10471,7 +10579,7 @@ msgid "Configure toolbar"
msgstr "Eszköztár beállítása"
msgid "Edit shortcut"
-msgstr ""
+msgstr "Gyorsbillentyű szerkesztése"
msgid "Do not hide toolbar and menu"
msgstr "Ne rejtse el az eszköztárat és a menüt"
@@ -10692,7 +10800,7 @@ msgstr "Beállítás hozzáadása"
msgid "Advanced Background: Changed"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid "Advanced Background: NonDefault"
msgstr ""
msgid "Current value is default."
@@ -10764,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"
@@ -10824,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"
@@ -10872,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"
@@ -10914,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 "
@@ -10984,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 "
@@ -11072,64 +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. Select image format"
-msgstr ""
+msgstr "3. Képformátum kiválasztása"
msgid "4. Verify generated WMS URL"
-msgstr ""
+msgstr "4. Generált WMS URL ellenőrzése"
msgid "5. Enter name for this layer"
-msgstr ""
+msgstr "5. Réteg elnevezése"
msgid "Show Bounds"
msgstr "Határok megjelenítése"
@@ -11183,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"
@@ -11259,7 +11385,7 @@ msgid "Downloader:"
msgstr "Letöltő:"
msgid "Simultaneous connections:"
-msgstr ""
+msgstr "Szimultán kapcsolatok:"
msgid "Overlap tiles"
msgstr "Csempék átfedése"
@@ -11307,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"
@@ -11329,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"
@@ -11370,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"
@@ -11415,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"
@@ -11458,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"
@@ -11466,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"
@@ -11507,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"
@@ -11572,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)"
@@ -11581,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)"
@@ -11593,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"
@@ -11611,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"
@@ -11620,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"
@@ -11646,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"
@@ -11682,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}''"
@@ -11690,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"
@@ -11699,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"
@@ -11736,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:"
@@ -11746,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. "
@@ -11845,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"
@@ -11928,8 +12081,8 @@ msgstr "Címkék alkalmazása"
msgid "New relation"
msgstr "Új kapcsolat"
-msgid "Change Properties"
-msgstr "Tulajdonságok megváltoztatása"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -11938,7 +12091,7 @@ msgid "Illegal member expression: {0}"
msgstr ""
msgid "More information about this feature"
-msgstr ""
+msgstr "További információk erről a tulajdonságról"
msgid "Available roles"
msgstr "Elérhető szerepek"
@@ -11947,19 +12100,19 @@ msgid "role"
msgstr "szerep"
msgid "count"
-msgstr ""
+msgstr "száma"
msgid "elements"
-msgstr ""
+msgstr "elemek"
msgid "Optional Attributes:"
-msgstr ""
+msgstr "Opcionális tulajdonságok:"
msgid "Select auto-increment of {0} for this field"
-msgstr ""
+msgstr "Mező értékének automatikus növelése: {0}"
msgid "Cancel auto-increment for this field"
-msgstr ""
+msgstr "Automaikus növelés törlése a mezőről"
msgid "{0}:"
msgstr "{0}:"
@@ -12007,9 +12160,6 @@ 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}: "
@@ -12028,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 ""
@@ -12059,9 +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 ""
@@ -12094,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 ""
@@ -12134,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..."
@@ -12254,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 ""
@@ -12269,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}."
@@ -12353,7 +12563,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -12452,58 +12662,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}."
@@ -12518,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>"
@@ -12605,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}."
@@ -12803,7 +12986,7 @@ 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}"
@@ -12849,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."
@@ -12879,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 ""
@@ -12913,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 ""
@@ -12987,15 +13191,15 @@ msgid "Download skipped"
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 ""
"Figyelmeztetés: ''{0}'' bővítményt nem lehet letölteni, mert a letöltési "
"link ismeretlen. Letöltés kihagyva."
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 ""
"Figyelmeztetés: ''{0}'' bővítményt nem lehet letölteni, mert a ''{1}'' "
"letöltési link érvénytelen. Letöltés kihagyva."
@@ -13168,11 +13372,11 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr "Bővítmény frissítése sikertelen"
-msgid "Warning: failed to find plugin {0}"
-msgstr "Figyelmeztetés: {0} bővítmény nem található"
+msgid "Failed to find plugin {0}"
+msgstr ""
-msgid "Warning: failed to download plugin information list"
-msgstr "Figyelmeztetés: bővítménylista letöltése nem sikerült"
+msgid "Failed to download plugin information list"
+msgstr ""
msgid "Disable plugin"
msgstr "Bövítmény letiltása"
@@ -13186,26 +13390,25 @@ msgstr "Bővítmény megtartása"
msgid "Click to keep the plugin ''{0}''"
msgstr "Kattints a(z) ''{0}'' bővítmény megtartásához"
-msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr "Figyelmeztetés: nem sikerült törölni az elavult ''{0}'' bővítményt."
+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 ""
"Figyelmeztetés: nem sikerült telepíteni a már letöltött ''{0}'' bővítményt. "
"Telepítés kihagyása. A JOSM a régi bővítményverziót fogja betölteni."
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 ""
"Figyelmeztetés: ''{0}'' bővítmény telepítése sikertelen az átmenetileg "
"letöltött ''{1}'' fájlból. {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 ""
"Figyelmeztetés: ''{0}'' bővítmény telepítése sikertelen az átmenetileg "
"letöltött ''{1}'' fájlból. Átnevezés sikertelen."
@@ -13284,8 +13487,7 @@ msgstr "Bővítmény site cache fájl feldolgozása…"
msgid "Processing file ''{0}''"
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 ""
"Figyelmeztetés: ''{0}'' fájlban bővítményinformációk keresése sikertelen. "
"Kihagyva."
@@ -13302,9 +13504,24 @@ 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 ""
"Figyelmeztetés: nem sikerült létrehozni a ''{0}'' bővítménykönyvtárat. Nem "
"lehet gyorsítótárazni a bővítménylistát a(z) ''{1}'' helyről."
@@ -13642,12 +13859,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -13658,9 +13874,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 ""
@@ -13694,9 +13953,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."
@@ -14019,6 +14292,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 ""
@@ -14258,6 +14536,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."
@@ -14307,9 +14588,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 ""
@@ -14346,6 +14624,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 ""
@@ -14477,6 +14760,9 @@ msgstr "Töltés"
msgid "Lit"
msgstr "Kivilágítás"
+msgid "Toll"
+msgstr "Fizetős"
+
msgid "Motorway Link"
msgstr "Autópályafelhajtó"
@@ -14567,6 +14853,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"
@@ -14585,11 +14915,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ó"
@@ -14600,6 +14930,9 @@ msgstr "kocsibehajtó"
msgid "parking_aisle"
msgstr "parkolóút"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "parkolóút"
@@ -14627,18 +14960,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"
@@ -14648,9 +14975,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"
@@ -14660,15 +14984,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"
@@ -14714,6 +15038,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)"
@@ -14798,6 +15125,9 @@ msgstr "Híd szerkesztése"
msgid "viaduct"
msgstr "viadukt"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr "nyitható"
@@ -14909,20 +15239,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"
@@ -14939,11 +15278,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"
@@ -14978,8 +15317,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"
@@ -15047,12 +15386,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"
@@ -15068,15 +15413,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)"
@@ -15098,6 +15434,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"
@@ -15107,6 +15452,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Mini-körforgalom"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Irány"
@@ -15116,11 +15464,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ó"
@@ -15152,9 +15497,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"
@@ -15197,6 +15539,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr "Engedélyezett forgalom:"
+msgid "Material"
+msgstr "Anyag"
+
+msgid "stone"
+msgstr "kő"
+
msgid "Bollard"
msgstr "Oszlop"
@@ -15212,6 +15560,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr "műanyag"
+
msgid "Cycle Barrier"
msgstr "Kerékpárakadály"
@@ -15281,20 +15632,17 @@ msgstr ""
msgid "electric"
msgstr "elektromos"
-msgid "roundpole"
-msgstr ""
-
-msgid "split_rail"
-msgstr "hasított gerenda"
+msgid "pole"
+msgstr "cölöp"
-msgid "chain"
-msgstr "lánc"
+msgid "Guard Rail"
+msgstr ""
-msgid "hedge"
-msgstr "sövény"
+msgid "Edit Guard Rail"
+msgstr ""
-msgid "pole"
-msgstr "cölöp"
+msgid "wire"
+msgstr ""
msgid "Guard Rail"
msgstr ""
@@ -15324,8 +15672,9 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
-msgstr "Árok szerkesztése"
+msgstr ""
msgid "Kerb"
msgstr ""
@@ -15333,11 +15682,11 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
-msgstr "Bejárat"
+msgid "Entrance (barrier opening)"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Bejárat szerkesztése"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Kapu"
@@ -15390,12 +15739,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr "Anyag"
-
-msgid "stone"
-msgstr "kő"
-
msgid "Turnstile"
msgstr "Forgókapu"
@@ -15456,12 +15799,21 @@ msgstr ""
msgid "Ditch"
msgstr "Árok"
+msgid "Edit Ditch"
+msgstr "Árok szerkesztése"
+
msgid "Stream"
msgstr "Patak"
msgid "Edit Stream"
msgstr "Patak szerkesztése"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Csatorna"
@@ -15501,9 +15853,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 ""
@@ -15537,6 +15886,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"
@@ -15618,20 +15982,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"
@@ -15705,7 +16074,7 @@ msgstr "turisztika"
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -15729,11 +16098,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"
@@ -15744,9 +16116,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"
@@ -15798,6 +16167,9 @@ msgstr ""
msgid "Level Crossing"
msgstr "Vasúti átjáró"
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr "Őrzött"
@@ -15810,18 +16182,32 @@ msgstr ""
msgid "Barrier"
msgstr "Akadály"
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
msgid "half"
-msgstr "fél"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "teljes"
+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"
@@ -15921,13 +16307,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"
@@ -15937,13 +16321,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ó"
@@ -15960,12 +16342,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"
@@ -15993,9 +16375,6 @@ msgstr "Parkolóhely"
msgid "Edit Parking space"
msgstr "Parkolóhely szerkesztése"
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Férőhely"
@@ -16017,11 +16396,30 @@ 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"
@@ -16170,6 +16568,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"
@@ -16191,6 +16592,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"
@@ -16218,6 +16625,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"
@@ -16242,22 +16655,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"
@@ -16279,9 +16676,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Alkatrészek"
-
msgid "Clothes"
msgstr "Ruhák"
@@ -16476,6 +16870,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -16506,6 +16903,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Pad"
@@ -16518,9 +16918,6 @@ msgstr "Kerekesszék"
msgid "limited"
msgstr "korlátozott"
-msgid "only"
-msgstr "kizárólag"
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -16530,8 +16927,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"
@@ -16545,6 +16947,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"
@@ -16569,14 +16974,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"
@@ -16625,8 +17022,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"
@@ -16679,6 +17076,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"
@@ -16701,21 +17113,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"
@@ -16905,9 +17302,6 @@ msgstr ""
msgid "Edit Stripclub"
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 "Tourism"
msgstr "Turizmus"
@@ -16929,9 +17323,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"
@@ -16944,6 +17344,9 @@ msgstr "utca"
msgid "scheme"
msgstr "vázlat"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Mutatott terület"
@@ -16983,6 +17386,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"
@@ -17004,23 +17410,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ő"
@@ -17149,50 +17567,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"
@@ -17209,6 +17621,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"
@@ -17221,6 +17639,9 @@ msgstr "metodista"
msgid "mormon"
msgstr "mormon"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ortodox"
@@ -17239,44 +17660,144 @@ msgstr "kvékersita"
msgid "roman_catholic"
msgstr ""
-msgid "shia"
-msgstr "síita"
+msgid "russian_orthodox"
+msgstr ""
-msgid "sunni"
-msgstr "szunnita"
+msgid "seventh_day_adventist"
+msgstr ""
msgid "Service Times"
msgstr "Szolgáltatás ideje"
-msgid "Su 10:00"
-msgstr "V 10:00"
+msgid "18:00"
+msgstr ""
-msgid "Su 10:30"
-msgstr "V 10:30"
+msgid "sunset,sunrise"
+msgstr ""
-msgid "Su 11:00"
-msgstr "V 11:00"
+msgid "Su 9:30,11:00"
+msgstr ""
-msgid "Opening Hours for visiting"
-msgstr "Nyitvatartás látogatóknak"
+msgid "Sa,Su,PH 9:00"
+msgstr ""
-msgid "Recording Studio"
-msgstr "Stúdió"
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
-msgid "Edit Studio"
-msgstr "Stúdió szerkesztése"
+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 "hang"
+msgid "Sa 10:00+"
+msgstr ""
-msgid "video"
-msgstr "videó"
+msgid "Mosque"
+msgstr ""
-msgid "Public Building"
-msgstr "Nyilvános épület"
+msgid "Edit Mosque"
+msgstr ""
-msgid "Edit Public Building"
-msgstr "Nyilvános épület szerkesztése"
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
+msgid "shia"
+msgstr "síita"
+
+msgid "sunni"
+msgstr "szunnita"
+
+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 "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"
+
+msgid "Edit Public Building"
+msgstr "Nyilvános épület szerkesztése"
msgid "Town hall"
msgstr "Városháza"
@@ -17359,6 +17880,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"
@@ -17440,12 +17967,66 @@ msgstr "Állatorvos"
msgid "Edit Veterinary"
msgstr "Állatorvos szerkesztése"
-msgid "Drinking water"
+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"
@@ -17455,6 +18036,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"
@@ -17464,30 +18069,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"
@@ -17516,8 +18127,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"
@@ -17543,21 +18154,15 @@ 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 "plastic"
-msgstr "műanyag"
-
msgid "Amount of Seats"
msgstr "Helyek száma"
@@ -17592,8 +18197,17 @@ msgstr "Vadászles szerkesztése"
msgid "Height"
msgstr "Magasság"
+msgctxt "height"
msgid "low"
-msgstr "alacsony"
+msgstr ""
+
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
msgid "Hide"
msgstr "Rejtett"
@@ -17601,9 +18215,6 @@ msgstr "Rejtett"
msgid "Lock"
msgstr "Zárható"
-msgid "Drinking Water"
-msgstr "Ivóvíz"
-
msgid "Edit Source of Potable Water"
msgstr ""
@@ -17635,6 +18246,9 @@ msgstr "tó"
msgid "Diameter (in mm)"
msgstr "Átmérő (mm-ben)"
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr "sáv"
@@ -17672,119 +18286,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"
@@ -17816,26 +18466,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"
@@ -17843,6 +18494,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"
@@ -17876,6 +18536,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"
@@ -17932,7 +18608,7 @@ msgid "Skating"
msgstr "Korcsolyázás"
msgid "Edit Skating"
-msgstr "Korcsolyázás szerkesztése"
+msgstr ""
msgid "ice_rink"
msgstr "jégpálya"
@@ -17976,38 +18652,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"
@@ -18048,19 +18742,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 ""
@@ -18199,6 +18889,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ó"
@@ -18211,38 +18913,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"
@@ -18250,20 +18987,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"
@@ -18489,42 +19265,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 Measurement Station"
-msgstr "Mérőállomás szerkesztése"
+msgid "Edit Monitoring Station"
+msgstr ""
-msgid "Measurement"
-msgstr "Mérés"
+msgid "Monitoring:"
+msgstr ""
-msgid "particulate_matter"
-msgstr "részecske"
+msgid "Weather"
+msgstr ""
-msgid "seismic"
-msgstr "szeizmikus"
+msgid "Water level"
+msgstr ""
-msgid "water_level"
-msgstr "vízszint"
+msgid "Tide Level"
+msgstr ""
-msgid "weather"
-msgstr "időjárás"
+msgid "Traffic"
+msgstr ""
-msgid "Recording"
-msgstr "Rögzítés"
+msgid "Air Quality"
+msgstr ""
-msgid "manually"
-msgstr "kézzel"
+msgid "Noise"
+msgstr ""
-msgid "automated"
-msgstr "automata"
+msgid "GPS Signals"
+msgstr ""
-msgid "remote"
-msgstr "távvezérelt"
+msgid "GLONASS Signals"
+msgstr ""
-msgctxt "display"
-msgid "no"
-msgstr "nincs"
+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 "Földmérési alappont"
@@ -18532,8 +19334,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"
@@ -18544,12 +19346,102 @@ msgstr "beltéri"
msgid "outdoor"
msgstr "kültéri"
-msgid "public"
-msgstr "nyilvános"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "bolt"
+
+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 "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"
@@ -18601,89 +19493,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 "battery charging"
-msgstr "akkumulátor töltés"
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
-msgid "Power Station"
-msgstr "Áramelosztó-állomás"
+msgid "steam_turbine"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Áramelosztó-állomás szerkesztése"
+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 "Áramelosztó-alállomás"
@@ -18694,6 +19689,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"
@@ -18709,6 +19719,9 @@ msgstr "Kábeltartó torony szerkesztése"
msgid "Tower reference"
msgstr "Torony azonosító"
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr "Villanyoszlop"
@@ -18727,13 +19740,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"
@@ -18840,11 +19851,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"
@@ -18855,8 +19866,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"
@@ -18876,6 +19887,9 @@ msgstr "Piac"
msgid "Edit Marketplace"
msgstr "Piac szerkesztése"
+msgid "Organic"
+msgstr "Biobolt"
+
msgid "Greengrocer"
msgstr "Zöldséges"
@@ -18888,9 +19902,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr "Biobolt"
-
msgid "Edit Organic/Bio"
msgstr "Biobolt szerkesztése"
@@ -18960,8 +19971,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"
@@ -18981,14 +19992,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"
@@ -18996,9 +20007,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"
@@ -19024,6 +20034,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"
@@ -19060,11 +20076,32 @@ msgstr "Ékszerész"
msgid "Edit Jewelry"
msgstr "Ékszerész szerkesztése"
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+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"
-msgstr "Szex shop szerkesztése"
+msgid "Edit Erotic Shop"
+msgstr ""
msgid "Florist"
msgstr "Virágüzlet"
@@ -19093,8 +20130,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"
@@ -19105,20 +20142,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"
@@ -19153,8 +20190,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"
@@ -19366,6 +20403,12 @@ msgstr "Csúcs"
msgid "Edit Peak"
msgstr "Csúcs szerkesztése"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Gleccser"
@@ -19405,24 +20448,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"
@@ -19432,15 +20484,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 ""
@@ -19516,6 +20559,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"
@@ -19570,8 +20619,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"
@@ -19582,6 +20631,9 @@ msgstr "Sírkert"
msgid "Edit Graveyard"
msgstr "Sírkert szerkesztése"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Temető"
@@ -19657,6 +20709,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"
@@ -19693,6 +20772,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)"
@@ -19861,20 +20952,49 @@ msgstr ""
msgid "Edit general route"
msgstr ""
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+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"
@@ -19921,20 +21041,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"
@@ -19957,8 +21080,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)"
@@ -20053,18 +21176,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ó"
@@ -20074,7 +21206,10 @@ msgstr "akadály"
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -20083,10 +21218,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"
@@ -20104,6 +21239,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -20119,28 +21257,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"
@@ -20161,20 +21299,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"
@@ -20248,10 +21386,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"
@@ -20266,9 +21407,6 @@ msgstr "Falu/Város"
msgid "One Way"
msgstr "Egyirányú"
-msgid "Church"
-msgstr "Templom"
-
msgid "Fuel Station"
msgstr "Benzinkút"
@@ -20296,6 +21434,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -20341,10 +21482,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"
@@ -20356,7 +21527,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"
@@ -20374,7 +21545,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -20491,19 +21662,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 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"
@@ -20522,7 +21804,46 @@ 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 "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 "Landsat"
@@ -20534,19 +21855,25 @@ 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"
@@ -20567,7 +21894,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -20576,6 +21903,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -20669,7 +21999,7 @@ msgstr ""
msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Freemap.sk Ski"
msgstr ""
msgid "Géolittoral - Sentiers"
@@ -20678,13 +22008,13 @@ msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
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"
@@ -20722,6 +22052,29 @@ 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 ""
@@ -20887,6 +22240,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -20932,6 +22288,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV Files"
@@ -21133,6 +22522,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 ""
@@ -21154,13 +22555,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -21423,10 +22818,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -21630,7 +23028,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"
@@ -21893,73 +23291,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 ""
@@ -22080,6 +23469,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 ""
@@ -22098,12 +23490,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -22239,6 +23625,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 ""
@@ -22256,6 +23645,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 ""
@@ -22482,7 +23874,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."
@@ -22532,7 +23927,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -22756,27 +24151,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 ""
@@ -23854,9 +25231,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 ""
@@ -24122,8 +25523,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 ""
@@ -24503,9 +25904,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -24558,18 +25956,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 ""
@@ -24916,6 +26302,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -25067,6 +26474,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 ""
@@ -25384,9 +26794,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -25602,6 +27009,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 ""
@@ -25634,15 +27044,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 ""
@@ -25757,9 +27183,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -25861,7 +27284,7 @@ msgid "SDS tag prefix"
msgstr ""
msgid "Connection successful."
-msgstr ""
+msgstr "Kapcsolódás sikeres."
msgid "Cannot connect to SDS server: "
msgstr ""
@@ -25938,19 +27361,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"
@@ -26166,6 +27589,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 ""
@@ -26202,6 +27714,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..."
@@ -26354,9 +27871,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -27432,9 +28946,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -27719,9 +29230,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 578357e..16ce611 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-08-04 03:41+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-08-05 04:33+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -62,6 +65,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -162,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 ""
@@ -250,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -289,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -343,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 ""
@@ -523,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -636,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 ""
@@ -786,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"
@@ -972,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 ""
@@ -995,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>"
@@ -1163,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1304,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"
@@ -1399,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 ""
@@ -1683,6 +1703,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1902,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] ""
@@ -2328,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 ""
@@ -2524,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 ""
@@ -2611,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 ""
@@ -2647,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"
@@ -2673,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}''"
@@ -2778,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] ""
@@ -2838,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"
@@ -2869,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"
@@ -2893,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 ""
@@ -2923,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 ""
@@ -2943,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 ""
@@ -2952,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 ""
@@ -2972,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}"
@@ -3003,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}''."
@@ -3160,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 ""
@@ -3268,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 ""
@@ -3306,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3347,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3371,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 ""
@@ -3430,6 +3469,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3512,6 +3554,15 @@ 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 ""
@@ -3581,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 ""
@@ -3638,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})"
@@ -3676,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}"
@@ -3813,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"
@@ -3888,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 ""
@@ -3918,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3945,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''"
@@ -4011,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 ""
@@ -4131,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"
@@ -4360,6 +4400,18 @@ 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 ""
@@ -4464,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 ""
@@ -4764,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"
@@ -4801,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"
@@ -4853,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 ""
@@ -5110,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 ""
@@ -5638,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5721,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 ""
@@ -5811,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 ""
@@ -5982,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 ""
@@ -6269,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"
@@ -6335,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"
@@ -6377,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)"
@@ -6537,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"
@@ -6855,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 ""
@@ -6986,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 ""
@@ -7010,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 ""
@@ -7123,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."
@@ -7222,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7309,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"
@@ -7328,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 ""
@@ -7394,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"
@@ -7470,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 ""
@@ -7485,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"
@@ -7701,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 "
@@ -7715,13 +7795,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7730,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 ""
@@ -7737,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 ..."
@@ -7850,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] ""
@@ -7862,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>"
@@ -7878,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:"
@@ -8024,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8054,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"
@@ -8407,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8428,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 ""
@@ -8485,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8551,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 ""
@@ -8734,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}''..."
@@ -8756,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"
@@ -8766,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:"
@@ -8987,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}''"
@@ -9702,6 +9811,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9770,6 +9912,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9823,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 ""
@@ -10279,6 +10429,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 ""
@@ -10342,7 +10498,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 ""
@@ -10600,40 +10756,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}''"
@@ -10686,8 +10842,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:"
@@ -10696,20 +10852,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 ""
@@ -10791,14 +10952,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,7 +11026,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10950,9 +11105,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10971,6 +11123,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 ""
@@ -11000,9 +11160,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 ""
@@ -11033,7 +11233,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 ""
@@ -11073,28 +11273,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..."
@@ -11189,6 +11387,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11204,12 +11405,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}."
@@ -11288,7 +11497,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11387,35 +11596,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 ""
@@ -11425,8 +11610,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 ..."
@@ -11453,10 +11638,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>"
@@ -11540,8 +11722,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}."
@@ -11738,7 +11920,7 @@ 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}"
@@ -11784,6 +11966,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."
@@ -11814,19 +12005,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 ""
@@ -11848,11 +12039,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 ""
@@ -11922,13 +12125,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}''"
@@ -12071,10 +12274,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"
@@ -12089,22 +12292,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}''"
@@ -12173,8 +12375,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..."
@@ -12189,9 +12390,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}''"
@@ -12513,12 +12729,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12529,30 +12744,73 @@ 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 "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] ""
+
+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"
@@ -12563,9 +12821,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."
@@ -12888,6 +13160,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 ""
@@ -13127,6 +13404,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."
@@ -13176,9 +13456,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 ""
@@ -13215,6 +13492,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 ""
@@ -13345,6 +13627,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13435,6 +13720,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 ""
@@ -13453,10 +13782,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 +13797,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13495,18 +13827,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 ""
@@ -13516,9 +13842,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13528,13 +13851,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13582,6 +13905,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13666,6 +13992,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13770,21 +14099,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 ""
@@ -13800,10 +14138,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"
@@ -13839,7 +14177,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13908,12 +14246,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 ""
@@ -13929,15 +14273,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 ""
@@ -13959,6 +14294,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13968,6 +14312,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13977,10 +14324,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14013,9 +14357,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14058,6 +14399,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14073,6 +14420,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14142,19 +14492,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14185,6 +14529,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14194,10 +14539,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14251,12 +14596,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14317,12 +14656,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14362,9 +14710,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14398,6 +14743,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 ""
@@ -14479,18 +14839,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 ""
@@ -14566,7 +14931,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14590,10 +14955,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"
@@ -14605,9 +14973,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14659,6 +15024,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14671,6 +15039,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14782,11 +15185,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14798,11 +15199,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14821,10 +15220,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14854,9 +15253,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14878,10 +15274,29 @@ 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"
@@ -15031,6 +15446,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15052,6 +15470,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15079,6 +15503,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15103,22 +15533,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 ""
@@ -15140,9 +15554,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15337,6 +15748,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15367,6 +15781,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15379,9 +15796,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15391,9 +15805,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15406,6 +15825,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15430,14 +15852,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15486,7 +15900,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15540,41 +15954,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"
@@ -15766,9 +16180,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15790,9 +16201,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15805,6 +16222,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15844,6 +16264,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15865,22 +16288,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"
@@ -16010,49 +16445,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"
@@ -16070,6 +16499,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16082,6 +16517,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16100,37 +16538,137 @@ 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"
@@ -16220,6 +16758,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 ""
@@ -16301,128 +16845,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16453,16 +17075,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16496,6 +17124,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16533,117 +17164,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 ""
@@ -16677,33 +17344,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 ""
@@ -16737,6 +17414,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 ""
@@ -16837,36 +17530,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 ""
@@ -16909,19 +17620,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 ""
@@ -17060,6 +17767,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 ""
@@ -17072,60 +17791,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 ""
@@ -17350,41 +18143,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"
@@ -17393,7 +18212,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17405,12 +18224,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 ""
@@ -17462,88 +18371,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17555,6 +18567,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 ""
@@ -17570,6 +18597,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17588,11 +18618,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17701,10 +18729,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17716,7 +18744,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17737,6 +18765,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17749,9 +18780,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17821,7 +18849,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17842,13 +18870,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"
@@ -17857,7 +18885,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17885,6 +18912,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17921,10 +18954,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"
@@ -17954,7 +19008,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17966,19 +19020,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"
@@ -18014,7 +19068,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18227,6 +19281,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18266,24 +19326,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 ""
@@ -18293,15 +19362,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18377,6 +19437,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18431,7 +19497,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18443,6 +19509,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18479,43 +19548,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18554,6 +19650,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18722,21 +19830,50 @@ 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 ""
+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 ""
@@ -18782,19 +19919,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"
@@ -18818,7 +19958,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18914,18 +20054,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 ""
@@ -18935,7 +20084,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18944,10 +20096,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18965,6 +20117,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18980,28 +20135,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"
@@ -19022,19 +20177,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"
@@ -19109,10 +20264,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19127,9 +20285,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19157,6 +20312,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19202,10 +20360,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"
@@ -19217,7 +20405,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"
@@ -19235,7 +20423,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19352,19 +20540,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 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"
@@ -19383,7 +20682,46 @@ 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 "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 "Landsat"
@@ -19395,19 +20733,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 "skobbler heatmap"
@@ -19428,7 +20775,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19437,6 +20784,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19583,6 +20933,29 @@ 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 ""
@@ -19748,6 +21121,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19793,6 +21169,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19979,19 +21388,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20015,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}''."
@@ -20284,10 +21699,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20491,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"
@@ -20762,15 +22180,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20941,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 ""
@@ -20959,12 +22371,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21100,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 ""
@@ -21117,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 ""
@@ -21343,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."
@@ -21393,7 +22808,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21578,6 +22993,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21617,27 +23097,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 ""
@@ -22715,9 +24177,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 ""
@@ -23364,9 +24843,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23419,18 +24895,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 ""
@@ -23777,6 +25241,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23928,6 +25413,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 ""
@@ -24245,9 +25733,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24463,6 +25948,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 ""
@@ -24495,15 +25983,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 ""
@@ -24618,9 +26122,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24799,19 +26300,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"
@@ -25027,6 +26528,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 ""
@@ -25063,6 +26653,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..."
@@ -25215,9 +26808,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26203,9 +27793,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26484,9 +28071,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 189b20c..d692c48 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-08-04 03:41+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-08-05 04:46+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 ""
@@ -250,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -289,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -343,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 ""
@@ -523,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -636,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 ""
@@ -786,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"
@@ -972,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 ""
@@ -995,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>"
@@ -1163,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1304,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"
@@ -1399,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 ""
@@ -1683,6 +1703,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1902,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] ""
@@ -2328,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 ""
@@ -2524,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 ""
@@ -2611,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 ""
@@ -2647,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"
@@ -2673,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}''"
@@ -2778,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] ""
@@ -2838,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"
@@ -2869,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"
@@ -2893,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 ""
@@ -2923,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 ""
@@ -2943,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 ""
@@ -2952,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 ""
@@ -2972,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}"
@@ -3003,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}''."
@@ -3160,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 ""
@@ -3268,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 ""
@@ -3306,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3347,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3371,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 ""
@@ -3430,6 +3469,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3512,6 +3554,15 @@ 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 ""
@@ -3581,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 ""
@@ -3638,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})"
@@ -3676,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}"
@@ -3813,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"
@@ -3888,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 ""
@@ -3918,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3945,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''"
@@ -4011,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 ""
@@ -4131,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"
@@ -4360,6 +4400,18 @@ 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 ""
@@ -4464,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 ""
@@ -4764,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"
@@ -4801,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"
@@ -4853,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 ""
@@ -5110,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 ""
@@ -5638,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5721,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 ""
@@ -5811,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 ""
@@ -5982,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 ""
@@ -6269,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"
@@ -6335,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"
@@ -6377,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)"
@@ -6537,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"
@@ -6855,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 ""
@@ -6986,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 ""
@@ -7010,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 ""
@@ -7123,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."
@@ -7222,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7309,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"
@@ -7328,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 ""
@@ -7394,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"
@@ -7470,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 ""
@@ -7485,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"
@@ -7701,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 "
@@ -7715,13 +7795,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7730,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 ""
@@ -7737,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 ..."
@@ -7850,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] ""
@@ -7862,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>"
@@ -7878,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:"
@@ -8024,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8054,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"
@@ -8407,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8428,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 ""
@@ -8485,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8551,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 ""
@@ -8734,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}''..."
@@ -8756,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"
@@ -8766,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:"
@@ -8987,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}''"
@@ -9702,6 +9811,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9770,6 +9912,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9823,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 ""
@@ -10279,6 +10429,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 ""
@@ -10342,7 +10498,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 ""
@@ -10600,40 +10756,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}''"
@@ -10686,8 +10842,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:"
@@ -10696,20 +10852,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 ""
@@ -10791,14 +10952,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,7 +11026,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10950,9 +11105,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10971,6 +11123,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 ""
@@ -11000,9 +11160,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 ""
@@ -11033,7 +11233,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 ""
@@ -11073,28 +11273,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..."
@@ -11189,6 +11387,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11204,12 +11405,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}."
@@ -11288,7 +11497,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11387,35 +11596,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 ""
@@ -11425,8 +11610,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 ..."
@@ -11453,10 +11638,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>"
@@ -11540,8 +11722,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}."
@@ -11738,7 +11920,7 @@ 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}"
@@ -11784,6 +11966,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."
@@ -11814,19 +12005,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 ""
@@ -11848,11 +12039,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 ""
@@ -11922,13 +12125,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}''"
@@ -12071,10 +12274,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"
@@ -12089,22 +12292,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}''"
@@ -12173,8 +12375,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..."
@@ -12189,9 +12390,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}''"
@@ -12513,12 +12729,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12529,30 +12744,73 @@ 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 "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] ""
+
+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"
@@ -12563,9 +12821,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."
@@ -12888,6 +13160,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 ""
@@ -13127,6 +13404,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."
@@ -13176,9 +13456,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 ""
@@ -13215,6 +13492,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 ""
@@ -13345,6 +13627,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13435,6 +13720,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 ""
@@ -13453,10 +13782,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 +13797,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13495,18 +13827,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 ""
@@ -13516,9 +13842,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13528,13 +13851,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13582,6 +13905,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13666,6 +13992,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13770,21 +14099,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 ""
@@ -13800,10 +14138,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"
@@ -13839,7 +14177,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13908,12 +14246,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 ""
@@ -13929,15 +14273,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 ""
@@ -13959,6 +14294,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13968,6 +14312,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13977,10 +14324,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14013,9 +14357,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14058,6 +14399,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14073,6 +14420,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14142,19 +14492,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14185,6 +14529,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14194,10 +14539,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14251,12 +14596,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14317,12 +14656,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14362,9 +14710,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14398,6 +14743,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 ""
@@ -14479,18 +14839,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 ""
@@ -14566,7 +14931,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14590,10 +14955,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"
@@ -14605,9 +14973,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14659,6 +15024,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14671,6 +15039,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14782,11 +15185,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14798,11 +15199,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14821,10 +15220,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14854,9 +15253,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14878,10 +15274,29 @@ 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"
@@ -15031,6 +15446,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15052,6 +15470,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15079,6 +15503,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15103,22 +15533,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 ""
@@ -15140,9 +15554,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15337,6 +15748,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15367,6 +15781,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15379,9 +15796,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15391,9 +15805,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15406,6 +15825,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15430,14 +15852,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15486,7 +15900,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15540,41 +15954,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"
@@ -15766,9 +16180,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15790,9 +16201,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15805,6 +16222,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15844,6 +16264,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15865,22 +16288,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"
@@ -16010,49 +16445,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"
@@ -16070,6 +16499,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16082,6 +16517,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16100,37 +16538,137 @@ 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"
@@ -16220,6 +16758,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 ""
@@ -16301,128 +16845,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16453,16 +17075,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16496,6 +17124,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16533,117 +17164,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 ""
@@ -16677,33 +17344,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 ""
@@ -16737,6 +17414,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 ""
@@ -16837,36 +17530,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 ""
@@ -16909,19 +17620,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 ""
@@ -17060,6 +17767,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 ""
@@ -17072,60 +17791,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 ""
@@ -17350,41 +18143,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"
@@ -17393,7 +18212,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17405,12 +18224,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 ""
@@ -17462,88 +18371,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17555,6 +18567,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 ""
@@ -17570,6 +18597,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17588,11 +18618,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17701,10 +18729,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17716,7 +18744,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17737,6 +18765,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17749,9 +18780,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17821,7 +18849,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17842,13 +18870,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"
@@ -17857,7 +18885,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17885,6 +18912,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17921,10 +18954,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"
@@ -17954,7 +19008,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17966,19 +19020,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"
@@ -18014,7 +19068,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18227,6 +19281,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18266,24 +19326,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 ""
@@ -18293,15 +19362,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18377,6 +19437,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18431,7 +19497,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18443,6 +19509,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18479,43 +19548,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18554,6 +19650,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18722,21 +19830,50 @@ 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 ""
+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 ""
@@ -18782,19 +19919,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"
@@ -18818,7 +19958,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18914,18 +20054,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 ""
@@ -18935,7 +20084,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18944,10 +20096,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18965,6 +20117,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18980,28 +20135,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"
@@ -19022,19 +20177,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"
@@ -19109,10 +20264,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19127,9 +20285,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19157,6 +20312,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19202,10 +20360,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"
@@ -19217,7 +20405,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"
@@ -19235,7 +20423,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19352,19 +20540,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 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"
@@ -19383,7 +20682,46 @@ 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 "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 "Landsat"
@@ -19395,19 +20733,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 "skobbler heatmap"
@@ -19428,7 +20775,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19437,6 +20784,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19583,6 +20933,29 @@ 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 ""
@@ -19748,6 +21121,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19793,6 +21169,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19979,19 +21388,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20015,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}''."
@@ -20284,10 +21699,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20491,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"
@@ -20762,15 +22180,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20941,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 ""
@@ -20959,12 +22371,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21100,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 ""
@@ -21117,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 ""
@@ -21343,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."
@@ -21393,7 +22808,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21578,6 +22993,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21617,27 +23097,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 ""
@@ -22715,9 +24177,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 ""
@@ -23364,9 +24843,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23419,18 +24895,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 ""
@@ -23777,6 +25241,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23928,6 +25413,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 ""
@@ -24245,9 +25733,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24463,6 +25948,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 ""
@@ -24495,15 +25983,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 ""
@@ -24618,9 +26122,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24799,19 +26300,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"
@@ -25027,6 +26528,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 ""
@@ -25063,6 +26653,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..."
@@ -25215,9 +26808,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26203,9 +27793,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26484,9 +28071,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 549f0dd..fe1f0ae 100644
--- a/i18n/po/id.po
+++ b/i18n/po/id.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-04 03:41+0200\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"
@@ -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-08-20 04:32+0000\n"
-"X-Generator: Launchpad (build 16723)\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"
@@ -51,6 +51,9 @@ 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}"
@@ -60,6 +63,9 @@ msgstr "INFO: {0}"
msgid "DEBUG: {0}"
msgstr "DEBUG: {0}"
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Melaksanakan platform baru yang terkait"
@@ -164,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 "
@@ -268,9 +269,6 @@ 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"
@@ -307,6 +305,9 @@ 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}"
@@ -363,11 +364,9 @@ msgstr ""
"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 garis/way (Garis/way tidak dapat digabungkan dalam "
-"sebuah rangkaian node)"
msgid "Combine {0} ways"
msgstr "Gabungkan {0} way/garis"
@@ -552,6 +551,9 @@ msgstr ""
"Tampilkan informasi riwayat tentang way/garis, node/titik, atau relasi dalam "
"OSM."
+msgid "Show history"
+msgstr "Tunjukkan riwayat"
+
msgid "History (web)"
msgstr "Riwayat (web)"
@@ -678,11 +680,9 @@ 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 way/garis merupakan bagian dari relasi yang telah dimodifikasi. "
-"Mohon verifikasi tidak ada kesalahan yang telah dikenalkan."
msgid "Fix tag conflicts"
msgstr "Perbaiki label yang konflik"
@@ -846,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"
@@ -1051,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 "
@@ -1081,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>"
@@ -1264,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"
@@ -1413,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"
@@ -1529,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"
@@ -1827,6 +1828,9 @@ 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)"
msgstr "Download {0} dari {1} {2} tersisa"
@@ -2065,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"
@@ -2544,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"
@@ -2757,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 "
@@ -2856,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}"
@@ -2892,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"
@@ -2919,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}"
@@ -3029,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"
@@ -3089,11 +3098,9 @@ msgid "Reverse directional way."
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"
@@ -3122,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"
@@ -3148,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}"
@@ -3181,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 "
@@ -3205,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 "
@@ -3218,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 "
@@ -3245,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}"
@@ -3278,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}\"."
@@ -3454,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."
@@ -3570,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)"
@@ -3614,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"
@@ -3657,6 +3647,9 @@ msgstr "Validasi lainnya"
msgid "Running test {0}"
msgstr "Melakukan tes {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Alamat"
@@ -3681,6 +3674,15 @@ 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"
msgstr "Bangunan didalam bangunan"
@@ -3743,6 +3745,9 @@ 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"
@@ -3829,6 +3834,15 @@ 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"
@@ -3903,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"
@@ -3964,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})"
@@ -4005,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}"
@@ -4148,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"
@@ -4227,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}"
@@ -4257,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"
@@ -4287,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\""
@@ -4353,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)"
@@ -4476,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"
@@ -4722,6 +4720,18 @@ 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 "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"
@@ -4828,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)"
@@ -5152,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."
@@ -5159,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."
@@ -5166,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."
@@ -5183,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"
@@ -5199,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"
@@ -5252,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"
@@ -5528,16 +5531,15 @@ msgctxt "tag"
msgid "Key:"
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 "
@@ -6116,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"
@@ -6198,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"
@@ -6289,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 "
@@ -6468,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"
@@ -6796,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 ""
@@ -6869,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"
@@ -6911,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)"
@@ -7072,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"
@@ -7420,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"
@@ -7567,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, "
@@ -7593,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"
@@ -7729,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."
@@ -7839,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"
@@ -7947,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"
@@ -7970,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:"
@@ -8038,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"
@@ -8124,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 "
@@ -8145,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"
@@ -8383,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 "
@@ -8404,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"
@@ -8420,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"
@@ -8427,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 ..."
@@ -8559,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..."
@@ -8572,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>"
@@ -8592,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"
@@ -8739,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"
@@ -8772,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"
@@ -9145,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..."
@@ -9166,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"
@@ -9223,6 +9270,12 @@ 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"
@@ -9305,9 +9358,6 @@ 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"
@@ -9505,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}\"..."
@@ -9529,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"
@@ -9541,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:"
@@ -9809,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}\""
@@ -10605,8 +10645,8 @@ msgstr "menambahkan pengaturan"
msgid "Advanced Background: Changed"
msgstr "Latar Belakang lanjutan: Diubah"
-msgid "Advanced Background: NonDefalut"
-msgstr "Latar belakang Lanjutan: Bukan pengaturan awal"
+msgid "Advanced Background: NonDefault"
+msgstr ""
msgid "Current value is default."
msgstr "Nilai saat ini adalah standar"
@@ -10675,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"
@@ -10734,6 +10777,11 @@ 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"
@@ -11225,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"
@@ -11294,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"
@@ -11574,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"
@@ -11610,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}''"
@@ -11674,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:"
@@ -11686,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. "
@@ -11795,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"
@@ -11876,8 +11919,8 @@ msgstr "Tambahkan Preset"
msgid "New relation"
msgstr "Relasi baru"
-msgid "Change Properties"
-msgstr "Ubah properti"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr "Tidak diketahui keperluan: {0}"
@@ -11965,9 +12008,6 @@ 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}: "
@@ -11986,6 +12026,16 @@ msgstr "Tampilkan hanya berlaku pada pilihan"
msgid "Search in tags"
msgstr "Cari pada tag"
+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 (*.*)"
@@ -12020,9 +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 ""
@@ -12059,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."
@@ -12108,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..."
@@ -12243,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}."
@@ -12258,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}."
@@ -12351,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"
@@ -12456,46 +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 ""
-"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 ""
-"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 "
@@ -12505,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 ..."
@@ -12537,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 ""
@@ -12636,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}."
@@ -12844,9 +12897,14 @@ 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 "RemoteControl::Accepting connections on port {0}"
msgstr "RemoteControl::Menerima koneksi dalam port {0}"
@@ -12893,6 +12951,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."
@@ -12927,20 +12994,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: "
@@ -12964,12 +13031,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}\"."
@@ -13044,18 +13123,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}''"
@@ -13213,11 +13288,11 @@ msgstr[0] ""
msgid "Plugin update failed"
msgstr "Update plugin gagal"
-msgid "Warning: failed to find plugin {0}"
-msgstr "Peringatan: gagal untuk menemukan 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"
@@ -13231,29 +13306,24 @@ 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 ""
"Peringatan: gagal untuk menginstal plugin ''{0}'' dari file download "
"sementara ''{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 ""
-"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}''"
@@ -13327,10 +13397,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..."
@@ -13344,12 +13412,25 @@ msgstr "Download daftar plugin"
msgid "Downloading plugin list from ''{0}''"
msgstr "Mendownload daftar plugin dari ''{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 ""
-"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}''"
@@ -13763,15 +13844,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 "Failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
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 ""
-"Peringatan: Gagal mengakses direktori \"{0}\" untuk alasan keamanan. "
-"Pengecualian: {1}"
msgid "{0}... [please type its number]"
msgstr "{0}... [Harap ketik nomornya]"
@@ -13783,9 +13861,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 ""
@@ -13819,8 +13940,22 @@ 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 "
@@ -14165,6 +14300,11 @@ 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 ""
@@ -14468,6 +14608,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."
@@ -14527,9 +14670,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"
@@ -14576,6 +14716,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"
@@ -14718,6 +14863,9 @@ msgstr "Pematang"
msgid "Lit"
msgstr "Sulut"
+msgid "Toll"
+msgstr "Tol"
+
msgid "Motorway Link"
msgstr "Penghubung Jalan Tol"
@@ -14808,6 +14956,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"
@@ -14826,11 +15018,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"
@@ -14841,6 +15033,9 @@ msgstr "Jalan Masuk"
msgid "parking_aisle"
msgstr "tempat_parkir"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Tempat Parkir"
@@ -14868,18 +15063,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"
@@ -14889,9 +15078,6 @@ msgstr "Pelarangan moda transportasi"
msgid "General Access"
msgstr "Akses Umum"
-msgid "destination"
-msgstr "Tujuan"
-
msgid "delivery"
msgstr "pengantaran"
@@ -14901,15 +15087,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"
@@ -14955,6 +15141,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)"
@@ -15039,6 +15228,9 @@ msgstr "Edit Jembatan"
msgid "viaduct"
msgstr "jembatan di atas jalan"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr "Ayunan"
@@ -15152,20 +15344,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"
@@ -15182,11 +15383,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"
@@ -15221,8 +15422,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"
@@ -15290,12 +15491,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"
@@ -15311,15 +15518,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"
@@ -15341,6 +15539,15 @@ 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"
@@ -15350,6 +15557,9 @@ msgstr "Beri way/garis"
msgid "Mini-roundabout"
msgstr "Bundaran kecil"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Arah"
@@ -15359,11 +15569,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"
@@ -15395,9 +15602,6 @@ msgstr "tabel"
msgid "Passing Place"
msgstr "melewati tempat"
-msgid "Edit Passing Place"
-msgstr "edit melewati tempat"
-
msgid "Turning Circle"
msgstr "Menghidupkan Lingkaran"
@@ -15440,6 +15644,12 @@ msgstr "Edit Blok"
msgid "Allowed traffic:"
msgstr "Diperbolehkan lalu lintas"
+msgid "Material"
+msgstr "Bahan"
+
+msgid "stone"
+msgstr "batu"
+
msgid "Bollard"
msgstr "Tonggak Penambat Kapal"
@@ -15455,6 +15665,9 @@ msgstr "meningkat"
msgid "removable"
msgstr "dapat dihapus"
+msgid "plastic"
+msgstr "plastik"
+
msgid "Cycle Barrier"
msgstr "Halangan Sepeda"
@@ -15524,20 +15737,17 @@ msgstr "chain_link"
msgid "electric"
msgstr "Listrik"
-msgid "roundpole"
-msgstr "roundpole"
-
-msgid "split_rail"
-msgstr "split_rail"
+msgid "pole"
+msgstr "tiang"
-msgid "chain"
-msgstr "rantai"
+msgid "Guard Rail"
+msgstr "Pembatas Jalan"
-msgid "hedge"
-msgstr "Membatasi"
+msgid "Edit Guard Rail"
+msgstr "Edit Pembatas Jalan"
-msgid "pole"
-msgstr "tiang"
+msgid "wire"
+msgstr ""
msgid "Guard Rail"
msgstr "Pembatas Jalan"
@@ -15567,8 +15777,9 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr "Parit"
+msgctxt "Barrier"
msgid "Edit Ditch"
-msgstr "Edit selokan"
+msgstr ""
msgid "Kerb"
msgstr "Separator"
@@ -15576,11 +15787,11 @@ msgstr "Separator"
msgid "Edit Kerb"
msgstr "Edit Separator"
-msgid "Entrance"
-msgstr "Pintu Masuk"
+msgid "Entrance (barrier opening)"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Edit Pintu Masuk"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Gerbang"
@@ -15633,12 +15844,6 @@ msgstr "pemeras"
msgid "stepover"
msgstr "melangkahi"
-msgid "Material"
-msgstr "Bahan"
-
-msgid "stone"
-msgstr "batu"
-
msgid "Turnstile"
msgstr "Pintu putar"
@@ -15699,12 +15904,21 @@ msgstr "Edit pipa saluran"
msgid "Ditch"
msgstr "Parit"
+msgid "Edit Ditch"
+msgstr "Edit selokan"
+
msgid "Stream"
msgstr "Anak Sungai"
msgid "Edit Stream"
msgstr "Edit aliran air"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Kanal"
@@ -15744,9 +15958,6 @@ msgstr "Edit Dam"
msgid "Groyne"
msgstr "Groyne"
-msgid "Edit Groyne"
-msgstr "Sunting Groyne"
-
msgid "Breakwater"
msgstr "Pemecah gelombang"
@@ -15780,6 +15991,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"
@@ -15861,20 +16087,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"
@@ -15948,8 +16179,8 @@ msgstr "pariwisata"
msgid "freight"
msgstr "Kargo"
-msgid "Service/Type"
-msgstr "Layanan/Tipe"
+msgid "Service type"
+msgstr ""
msgid "yard"
msgstr "halaman"
@@ -15972,11 +16203,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"
@@ -15987,9 +16221,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)"
@@ -16041,6 +16272,9 @@ msgstr "Edit Jalur Kereta yang tidak terpakai"
msgid "Level Crossing"
msgstr "Lintasan"
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr "Diawasi"
@@ -16053,18 +16287,32 @@ 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 "setengah"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "penuh"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "double_half"
msgstr ""
msgid "Crossing"
msgstr "Perlintasan"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Tipe Perlintasan"
@@ -16164,13 +16412,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"
@@ -16180,13 +16426,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"
@@ -16203,12 +16447,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"
@@ -16236,9 +16480,6 @@ msgstr "Ruang parkir"
msgid "Edit Parking space"
msgstr "Edit ruang parkir"
-msgid "rooftop"
-msgstr "atap"
-
msgid "Capacity"
msgstr "Kapasitas"
@@ -16260,11 +16501,30 @@ 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 "Su 10:00+"
+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 "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"
@@ -16413,6 +16673,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"
@@ -16434,6 +16697,12 @@ msgstr "Perbaikan"
msgid "Edit Car Repair"
msgstr "Edit Perbaikan Mobil"
+msgid "Parts"
+msgstr "Bagian"
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr "Ban"
@@ -16461,6 +16730,12 @@ msgstr "Penyewaan"
msgid "Edit Car Rental"
msgstr "Edit Penyewaan Mobil"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr "hanya"
+
msgid "Sharing"
msgstr "Berbagi"
@@ -16485,22 +16760,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"
@@ -16522,9 +16781,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Bagian"
-
msgid "Clothes"
msgstr "Pakaian"
@@ -16719,6 +16975,9 @@ msgstr "Platform"
msgid "Station or amenities"
msgstr "Stasiun atau ameniti"
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr "Bis"
@@ -16749,6 +17008,9 @@ msgstr "Funicular"
msgid "Ferry"
msgstr "Ferry"
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Kursi Taman"
@@ -16761,9 +17023,6 @@ msgstr "Kursi dorong"
msgid "limited"
msgstr "terbatas"
-msgid "only"
-msgstr "hanya"
-
msgid "Highway platform (legacy)"
msgstr "Pembatas Jalan Raya"
@@ -16773,9 +17032,14 @@ msgstr "Pembatas Kereta"
msgid "funicular"
msgstr "Kereta gunung"
+msgctxt "railway"
msgid "Station"
msgstr "Stasiun"
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Edit Stasiun"
+
msgid "Building"
msgstr "Bangunan"
@@ -16788,6 +17052,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"
@@ -16812,14 +17079,6 @@ msgstr "Akun atau kartu loyalitas"
msgid "Public Transport (legacy)"
msgstr "Transportasi Umum"
-msgctxt "railway"
-msgid "Station"
-msgstr "Stasiun"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Edit Stasiun"
-
msgid "UIC-Reference"
msgstr "UIC-Reference"
@@ -16868,8 +17127,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"
@@ -16922,6 +17181,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"
@@ -16944,21 +17218,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"
@@ -17148,9 +17407,6 @@ msgstr "Stripclub"
msgid "Edit Stripclub"
msgstr "Edit Stripclub"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Selasa-Minggu 08:00; Sabtu 08:00-12:00"
-
msgid "Tourism"
msgstr "Pariwisata"
@@ -17172,9 +17428,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"
@@ -17187,6 +17449,9 @@ msgstr "jalan"
msgid "scheme"
msgstr "skema"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Area yang ditunjukan"
@@ -17226,6 +17491,9 @@ msgstr "... mode transportasi lain kemungkinan"
msgid "Information Board"
msgstr "Papan Informasi"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Isi Papan"
@@ -17247,23 +17515,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"
@@ -17392,50 +17672,44 @@ msgstr "Karya seni"
msgid "Edit Artwork"
msgstr "Edit Karya Seni"
-msgid "Place of Worship"
-msgstr "Tempat Beribadah"
-
-msgid "Edit Place of Worship"
-msgstr "Edit Tempat Beribadah"
-
-msgid "Religion"
-msgstr "Agama"
+msgid "Recording Studio"
+msgstr "Studio Rekaman"
-msgid "bahai"
-msgstr "bahai"
+msgid "Edit Studio"
+msgstr "Edit Studi"
-msgid "buddhist"
-msgstr "budha"
+msgid "audio"
+msgstr "suara"
-msgid "christian"
-msgstr "kristen"
+msgid "video"
+msgstr "video"
-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"
@@ -17452,6 +17726,12 @@ msgstr "katolik"
msgid "evangelical"
msgstr "evangelikal"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "saksi_jehovah"
@@ -17464,6 +17744,9 @@ msgstr "methodist"
msgid "mormon"
msgstr "mormon"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "orthodox"
@@ -17482,59 +17765,159 @@ msgstr "quaker"
msgid "roman_catholic"
msgstr "katolik_roma"
-msgid "shia"
-msgstr "shia"
+msgid "russian_orthodox"
+msgstr ""
-msgid "sunni"
-msgstr "sunni"
+msgid "seventh_day_adventist"
+msgstr ""
msgid "Service Times"
msgstr "Waktu layanan"
-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 "Jam operasional untuk kunjungan"
+msgid "Sa,Su,PH 9:00"
+msgstr ""
-msgid "Recording Studio"
-msgstr "Studio Rekaman"
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
-msgid "Edit Studio"
-msgstr "Edit Studi"
+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 "suara"
+msgid "Sa 10:00+"
+msgstr ""
-msgid "video"
-msgstr "video"
+msgid "Mosque"
+msgstr ""
-msgid "Public Building"
-msgstr "Bangunan Publik"
+msgid "Edit Mosque"
+msgstr ""
-msgid "Edit Public Building"
-msgstr "Edit Bangunan Publik"
+msgid "mosque"
+msgstr ""
-msgid "Town hall"
-msgstr "Balai Kota"
+msgid "ibadi"
+msgstr ""
-msgid "Edit Town hall"
-msgstr "Edit Balai Kota"
+msgid "shia"
+msgstr "shia"
-msgid "Community Centre"
-msgstr "Pusat Komunitas"
+msgid "sunni"
+msgstr "sunni"
-msgid "Embassy"
-msgstr "Kedutaan Besar"
+msgid "Synagogue"
+msgstr ""
-msgid "Edit Embassy"
-msgstr "Edit Kedutaan Besar"
+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 "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"
+
+msgid "Edit Public Building"
+msgstr "Edit Bangunan Publik"
+
+msgid "Town hall"
+msgstr "Balai Kota"
+
+msgid "Edit Town hall"
+msgstr "Edit Balai Kota"
+
+msgid "Community Centre"
+msgstr "Pusat Komunitas"
+
+msgid "Embassy"
+msgstr "Kedutaan Besar"
+
+msgid "Edit Embassy"
+msgstr "Edit Kedutaan Besar"
msgid "Courthouse"
msgstr "Pengadilan"
@@ -17602,6 +17985,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"
@@ -17683,12 +18072,66 @@ msgstr "Dokter Hewan"
msgid "Edit Veterinary"
msgstr "Edit Dokter Hewan"
-msgid "Drinking water"
-msgstr "Air Minum"
+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"
@@ -17698,6 +18141,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"
@@ -17707,30 +18174,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"
@@ -17759,8 +18232,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"
@@ -17786,21 +18259,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 "plastic"
-msgstr "plastik"
-
msgid "Amount of Seats"
msgstr "Banyaknya Kursi"
@@ -17835,8 +18302,17 @@ msgstr "Edit Tempat Berburu"
msgid "Height"
msgstr "Tinggi"
+msgctxt "height"
msgid "low"
-msgstr "rendah"
+msgstr ""
+
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
msgid "Hide"
msgstr "Sembunyikan"
@@ -17844,9 +18320,6 @@ msgstr "Sembunyikan"
msgid "Lock"
msgstr "Kunci"
-msgid "Drinking Water"
-msgstr "Air Minum"
-
msgid "Edit Source of Potable Water"
msgstr "Edit Sumber Air Minum"
@@ -17878,6 +18351,9 @@ msgstr "kolam"
msgid "Diameter (in mm)"
msgstr "Diameter (dalam mm)"
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr "jalur"
@@ -17915,119 +18391,155 @@ 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"
@@ -18059,26 +18571,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"
@@ -18086,6 +18599,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"
@@ -18119,6 +18641,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"
@@ -18175,7 +18713,7 @@ msgid "Skating"
msgstr "Skating"
msgid "Edit Skating"
-msgstr "Edit Skating"
+msgstr ""
msgid "ice_rink"
msgstr "ice_rink"
@@ -18219,38 +18757,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"
@@ -18291,21 +18847,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"
@@ -18442,6 +18994,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"
@@ -18454,38 +19018,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"
@@ -18493,20 +19092,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"
@@ -18732,42 +19370,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"
@@ -18775,23 +19439,113 @@ 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"
-msgid "indoor"
-msgstr "indoor"
+msgid "indoor"
+msgstr "indoor"
+
+msgid "outdoor"
+msgstr "diluar"
+
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "toko"
+
+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 "Tenaga"
+
+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 "outdoor"
-msgstr "diluar"
+msgid "compressed air"
+msgstr "udara dipadatkan"
-msgid "public"
-msgstr "publik"
+msgid "steam"
+msgstr "uap"
-msgid "Power"
-msgstr "Tenaga"
+msgid "vacuum"
+msgstr "vakum"
msgid "Power Generator"
msgstr "Tenaga Generator"
@@ -18844,89 +19598,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 "battery charging"
-msgstr "pengisian baterai"
+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 "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"
@@ -18937,6 +19794,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"
@@ -18952,6 +19824,9 @@ msgstr "Edit Power Tower"
msgid "Tower reference"
msgstr "Tower reference"
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr "Tiang"
@@ -18970,13 +19845,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"
@@ -19083,11 +19956,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"
@@ -19098,8 +19971,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)"
@@ -19119,6 +19992,9 @@ msgstr "Pasar"
msgid "Edit Marketplace"
msgstr "Mengedit Pasar"
+msgid "Organic"
+msgstr "Organik"
+
msgid "Greengrocer"
msgstr "Penjual sayur"
@@ -19131,9 +20007,6 @@ msgstr "Toko Sayuran"
msgid "Edit Farm Stand"
msgstr "Edit Toko Sayuran"
-msgid "Organic"
-msgstr "Organik"
-
msgid "Edit Organic/Bio"
msgstr "Edit organik/bio"
@@ -19203,8 +20076,8 @@ msgstr "Edit Penjahit"
msgid "Fabric"
msgstr "Kain"
-msgid "Edit Fabric"
-msgstr "Edit Kain"
+msgid "Edit Fabric Shop"
+msgstr ""
msgid "Electronic"
msgstr "Elektronik"
@@ -19224,14 +20097,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"
@@ -19239,7 +20112,6 @@ msgstr "Hifi"
msgid "Edit Hifi Shop"
msgstr "Edit Hifi Shop"
-msgctxt "shop"
msgid "Video"
msgstr "Video"
@@ -19267,6 +20139,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"
@@ -19303,11 +20181,32 @@ msgstr "Perhiasan"
msgid "Edit Jewelry"
msgstr "Edit Perhiasan"
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr "budha"
+
+msgid "christian"
+msgstr "kristen"
+
+msgid "hindu"
+msgstr "hindu"
+
+msgid "jewish"
+msgstr "yahudi"
+
+msgid "muslim"
+msgstr "muslim"
+
msgid "Erotic"
msgstr "Erotic"
-msgid "Edit Erotic"
-msgstr "Edit Erotic"
+msgid "Edit Erotic Shop"
+msgstr ""
msgid "Florist"
msgstr "penjual bunga"
@@ -19336,8 +20235,8 @@ msgstr "Toko Perangkat Keras"
msgid "Paint"
msgstr "Cat"
-msgid "Edit Paint"
-msgstr "Edit Cat"
+msgid "Edit Paint Shop"
+msgstr ""
msgid "Furniture"
msgstr "Furniture"
@@ -19348,20 +20247,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"
@@ -19396,8 +20295,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"
@@ -19609,6 +20508,12 @@ msgstr "Puncak"
msgid "Edit Peak"
msgstr "Mengedit Puncak"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Gletser"
@@ -19648,24 +20553,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"
@@ -19675,15 +20589,6 @@ 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 "Padang Rumput"
@@ -19759,6 +20664,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"
@@ -19813,8 +20724,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"
@@ -19825,6 +20736,9 @@ msgstr "Pemakaman Kecil"
msgid "Edit Graveyard"
msgstr "Edit Pemakaman"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Pemakaman besar"
@@ -19900,6 +20814,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"
@@ -19936,6 +20877,18 @@ msgstr "seragam"
msgid "alphabetic"
msgstr "Alfabetik"
+msgid "Accuracy"
+msgstr "Akurasi"
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr "Hubungi (skema umum)"
@@ -20106,20 +21059,49 @@ msgstr "Rute umum"
msgid "Edit general route"
msgstr "Edit Rute umum"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+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"
@@ -20166,20 +21148,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"
@@ -20202,8 +21187,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)"
@@ -20298,18 +21283,27 @@ msgstr "way/garis yang melewati bawah jembatan"
msgid "way forming the outline footprint"
msgstr "way/garis membentuk jejak garis"
-msgid "nodes forming the outline"
-msgstr "simpul membentuk garis tepi"
+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"
msgstr "jembatan"
msgid "deprecated"
msgstr "usang"
+msgid "bicycle"
+msgstr "sepeda"
+
+msgid "foot"
+msgstr "pejalan kaki"
+
msgid "horse"
msgstr "kuda"
@@ -20319,8 +21313,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"
@@ -20328,11 +21325,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"
@@ -20349,6 +21346,9 @@ msgstr "deras"
msgid "railwaypoint"
msgstr "titik jalur rel"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr "dipo kereta"
@@ -20364,29 +21364,29 @@ 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"
-msgstr "Jalur ski_pemula"
+msgid "piste.easy"
+msgstr ""
-msgid "piste_intermediate"
-msgstr "Jalur ski_tingkat lanjut"
+msgid "piste.intermediate"
+msgstr ""
-msgid "piste_advanced"
-msgstr "Jalur ski_mahir"
+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 "tenaga"
@@ -20406,20 +21406,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"
@@ -20493,11 +21493,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"
@@ -20511,9 +21514,6 @@ msgstr "Desa/Kota"
msgid "One Way"
msgstr "Satu Arah"
-msgid "Church"
-msgstr "Gereja"
-
msgid "Fuel Station"
msgstr "SPBU"
@@ -20541,6 +21541,9 @@ 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 "jalan raya yang belum diberikan nama dan klasifikasi"
@@ -20586,11 +21589,41 @@ 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 "incline without highway"
-msgstr "miring tanpa jalan raya"
+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"
msgstr "Putaran tanpa jalan raya"
@@ -20601,8 +21634,8 @@ msgstr "jalur tanpa jalan raya"
msgid "lcn without highway"
msgstr "lcn tanpa jalan raya"
-msgid "lit without highway"
-msgstr "lit tanpa jalan raya"
+msgid "lit without highway/railway/piste/parking/platform"
+msgstr ""
msgid "living_street without highway"
msgstr "jalan_komplek tanpa jalan raya"
@@ -20619,8 +21652,8 @@ msgstr "jalan motor tanpa jalan raya"
msgid "ntd_id without highway"
msgstr "ntd_id tanpa jalan raya"
-msgid "oneway without highway"
-msgstr "satu jalur tanpa jalan raya"
+msgid "oneway without highway or railway"
+msgstr ""
msgid "sac_scale without highway"
msgstr "sac_scale tanpa jalan raya"
@@ -20736,22 +21769,133 @@ msgstr "kanal tanpa jalur air"
msgid "have_riverbank without waterway"
msgstr "memiliki_endapan sungai tanpa jalur air"
-msgid "tunnel without highway/railway/waterway"
-msgstr "terowongan tanpa jalan raya/rel kereta/jalur air"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
-msgid "bridge without highway/railway/waterway"
-msgstr "jembatan tanpa jalan raya/rel kereta/jalur air"
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
-msgid "psv without highway/railway/waterway"
-msgstr "psv tanpa jalan raya/rel kereta/jalur air"
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
msgid "width without physical linear feature"
msgstr "lebar tanpa fitur linear fisik"
-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 ""
"kecepatan maksimal tanpa jalan raya/jalur kereta api/tanda_lalu lintas"
+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"
msgstr "agama tanpa golongan agama"
@@ -20770,8 +21914,47 @@ msgstr ""
"tidak ada wikipedia-language yang diberikan, gunakan "
"\"wikipedia\"=\"language:page title\""
-msgid "unkown language prefix in wikipedia tag"
-msgstr "awalan bahasa tidak diketahui di tag wikipedia"
+msgid "unknown language prefix in wikipedia tag"
+msgstr ""
+
+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 "Landsat"
msgstr ""
@@ -20782,19 +21965,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 "skobbler heatmap"
@@ -20815,7 +22007,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -20824,6 +22016,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -20970,6 +22165,29 @@ 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 ""
@@ -21135,6 +22353,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -21156,29 +22377,71 @@ msgstr ""
msgid "OS OpenData StreetView"
msgstr ""
-msgid "OS OpenData Locator"
-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 "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 "Export"
+msgstr "Export"
+
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "perbaharui daftar port"
-msgid "Surrey Air Survey"
-msgstr ""
+msgid "Configure"
+msgstr "Konfigurasi"
-msgid "NLS - OS 6-inch Scotland 1842-82"
-msgstr ""
+msgid "Connection Error."
+msgstr "Kesalahan sambungan"
-msgid "NLS - OS 1:25k 1st Series 1937-61"
-msgstr ""
+msgid "configure the connected DG100"
+msgstr "konfigurasi disambungkan DG100"
-msgid "NLS - OS 1-inch 7th Series 1955-61"
-msgstr ""
+msgid "delete data after import"
+msgstr "Hapus data setelah import"
-msgid "OS 1:25k historic (OSM)"
-msgstr ""
+msgid "Columbus V-900 CSV Files"
+msgstr "Columbus V-900 CSV Files"
-msgid "OS Scottish Popular historic"
-msgstr ""
+msgid "Importing CSV file ''%s''..."
+msgstr "Mengimpor file CSV \"%s\"..."
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
-msgstr ""
+msgid "Markers of "
+msgstr "Penanda dari "
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV Files"
@@ -21389,6 +22652,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"
@@ -21410,14 +22685,8 @@ msgstr "Kenaikan"
msgid "Time"
msgstr "Waktu"
-msgid "Geoid"
-msgstr "Geoid"
-
-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}''."
@@ -21690,11 +22959,14 @@ 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 "Housenumber increment:"
-msgstr "Nomor rumah tingkat:"
+msgid "House number increment:"
+msgstr ""
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
@@ -21900,8 +23172,8 @@ 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"
@@ -22257,15 +23529,6 @@ msgstr "Nomor Rumah:"
msgid "Street Name:"
msgstr "Nama Jalan:"
-msgid "Increment"
-msgstr "Penambahan"
-
-msgid "Decrement"
-msgstr "Pengurangan"
-
-msgid "Numbers:"
-msgstr "Nomor:"
-
msgid "Big buildings mode"
msgstr "Mode bangunan besar"
@@ -22451,6 +23714,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."
@@ -22470,12 +23736,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "tinggi"
-
-msgid "medium"
-msgstr "sedang"
-
msgid "symbol"
msgstr "simbol"
@@ -22617,6 +23877,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 "Tampilan crosspieces:"
@@ -22636,6 +23899,9 @@ msgstr ""
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 "Tambahkan \"sumber=...\" ke elemen?"
@@ -22750,21 +24016,18 @@ msgstr "Lokasi {0} siap pada layar. tidak memuat memori sementara."
msgid "(optional)"
msgstr "Pilihan"
-msgid "Change location"
-msgstr "Ubah Lokasi"
-
-msgid "Set a new location for the next request"
-msgstr "Atur lokasi baru untuk permintaan selanjutnya"
+msgid "Image cropping"
+msgstr "Memotong gambar"
msgid "Add a new municipality layer"
msgstr "Tambahkan layer kotamadya"
-msgid "Commune"
-msgstr "kelompok"
+msgid "Image georeferencing"
+msgstr "Gambar georeferensi"
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
"<html>Masukkan kota atau nama desa.<br>Gunakan syntax dan tanda yang "
"diketaui oleh www.cadastre.gov.fr.</html>"
@@ -22775,8 +24038,8 @@ msgstr "Departemen"
msgid "<html>Departement number (optional)</html>"
msgstr "<html>Nomor departemen (optional)</html>"
-msgid "Add new layer"
-msgstr "Tambah layer baru"
+msgid "Enter cadastre east,north position"
+msgstr "Masukkan kadaster timur, posisi utara"
msgid "Open Cadastre Preferences"
msgstr "Buka pengaturan kadaster"
@@ -22787,17 +24050,17 @@ msgstr "Persempit georeferensi"
msgid "Improve georeferencing (only raster images)"
msgstr "Mengubah georeference (hanya gambar raster)"
-msgid "Reset cookie"
-msgstr "Atur ulang cookie"
+msgid "East"
+msgstr "Timur"
-msgid "Get a new cookie (session timeout)"
-msgstr "Dapatkan cookie baru (sesi habis)"
+msgid "I use the mouse"
+msgstr "Saya gunakan mouse"
msgid "Save image as..."
msgstr "Simpan gambar sebagai..."
-msgid "PNG files (*.png)"
-msgstr "PNG files (*.png)"
+msgid "Click second corner for image cropping"
+msgstr "Klik sudut kedua untuk pemotongan gambar"
msgid "GeoTiff files (*.tif)"
msgstr "Fle GeoTiff (*.tif)"
@@ -22885,8 +24148,11 @@ msgstr "layer WMS ({0}), {1} indeks(s) dimuat"
msgid "Is not vectorized."
msgstr "Bukan vektorisasi"
-msgid "Raster size: {0}"
-msgstr "Ukuran raster: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
+msgstr ""
msgid "Is vectorized."
msgstr "vektorisasi"
@@ -22940,8 +24206,8 @@ msgstr "Hapus skema yang dipilih dari daftar"
msgid "Color Schemes"
msgstr "Skema warna"
-msgid "Adress"
-msgstr "Alamat"
+msgid "Address"
+msgstr ""
msgid "Split area"
msgstr "Area terpisah"
@@ -23169,27 +24435,9 @@ 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"
@@ -24357,9 +25605,32 @@ 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 "Michigan Left"
@@ -25067,9 +26338,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 "Process queue"
msgstr "Antrian proses"
@@ -25126,18 +26394,6 @@ msgstr ""
msgid "Close: "
msgstr "Tutup: "
-msgid "New issue"
-msgstr "Isu baru"
-
-msgid "Create issue"
-msgstr "Buat isu"
-
-msgid "Describe the problem precisely"
-msgstr "Jelaskan masalah dengan tepat"
-
-msgid "Create: "
-msgstr "Buat: "
-
msgid "Open in browser"
msgstr "Buka di browser"
@@ -25488,6 +26744,27 @@ msgstr "Tes gagal: Tdiak dapaat membaca mtime"
msgid "Test failed: Could not write mtime."
msgstr "Tes gagal: Tidak dapat menulis mtime"
+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}?"
@@ -25643,6 +26920,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"
@@ -25965,9 +27245,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:"
@@ -26186,6 +27463,9 @@ 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}"
msgstr "Hilang target penggabungan untuk {0} dengan id {1}"
@@ -26221,15 +27501,35 @@ 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 ""
+"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 ""
+"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 "Preset negara:"
@@ -26344,9 +27644,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)"
@@ -26550,20 +27847,20 @@ 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"
-msgstr "Export"
+msgid "Select a map object"
+msgstr ""
msgid "AutoSave LiveData"
msgstr "AutoSave LiveData"
@@ -26788,6 +28085,95 @@ 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"
msgstr "GPG"
@@ -26827,6 +28213,11 @@ 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..."
@@ -26996,9 +28387,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:"
@@ -28130,9 +29518,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"
@@ -28439,9 +29824,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 e0acfeb..4e119fa 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-08-04 03:41+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-08-05 04:46+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 ""
@@ -253,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"
@@ -292,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}"
@@ -348,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"
@@ -530,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 ""
@@ -643,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 ""
@@ -793,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"
@@ -979,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 ""
@@ -1002,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>"
@@ -1171,9 +1171,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1322,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"
@@ -1417,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"
@@ -1701,6 +1719,9 @@ 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)"
@@ -1920,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] ""
@@ -2346,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 ""
@@ -2544,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 ""
@@ -2631,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}"
@@ -2667,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"
@@ -2693,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}''"
@@ -2801,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"
@@ -2861,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"
@@ -2892,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"
@@ -2916,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 ""
@@ -2946,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 ""
@@ -2966,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 ""
@@ -2975,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 ""
@@ -2995,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}"
@@ -3026,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}''."
@@ -3183,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 ""
@@ -3291,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 ""
@@ -3329,9 +3357,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3370,6 +3395,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Heimilisfang"
@@ -3394,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 ""
@@ -3453,6 +3490,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3535,6 +3575,15 @@ 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"
@@ -3604,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 ""
@@ -3661,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})"
@@ -3699,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}"
@@ -3836,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"
@@ -3911,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 ""
@@ -3941,9 +3999,6 @@ msgstr "bygging"
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3968,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''"
@@ -4034,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 ""
@@ -4154,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"
@@ -4385,6 +4423,18 @@ 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óð"
@@ -4489,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 ""
@@ -4789,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 "> 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"
@@ -4826,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"
@@ -4878,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 ""
@@ -5135,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 ""
@@ -5663,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"
@@ -5746,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"
@@ -5838,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 ""
@@ -6009,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"
@@ -6298,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"
@@ -6364,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"
@@ -6406,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)"
@@ -6566,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"
@@ -6884,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"
@@ -7021,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, "
@@ -7045,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 ""
@@ -7158,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."
@@ -7257,6 +7334,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7344,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"
@@ -7363,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 ""
@@ -7432,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"
@@ -7508,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 ""
@@ -7523,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"
@@ -7739,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 "
@@ -7753,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 ""
@@ -7768,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"
@@ -7775,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 ..."
@@ -7888,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] ""
@@ -7900,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>"
@@ -7920,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:"
@@ -8066,7 +8175,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8096,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"
@@ -8449,9 +8558,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8470,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 ""
@@ -8527,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 ""
@@ -8593,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 ""
@@ -8776,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}''..."
@@ -8798,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"
@@ -8808,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:"
@@ -9029,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}''"
@@ -9748,6 +9855,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9816,6 +9956,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9869,6 +10012,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 ""
@@ -10329,6 +10477,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 ""
@@ -10392,7 +10546,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 ""
@@ -10652,40 +10806,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}''"
@@ -10738,8 +10892,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:"
@@ -10748,20 +10902,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 ""
@@ -10843,14 +11002,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"
@@ -10923,8 +11076,8 @@ msgstr "Vista forstillingu"
msgid "New relation"
msgstr ""
-msgid "Change Properties"
-msgstr "Breyta eigindum"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -11002,9 +11155,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -11023,6 +11173,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 ""
@@ -11054,9 +11212,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 ""
@@ -11087,7 +11285,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 ""
@@ -11127,28 +11325,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..."
@@ -11243,6 +11439,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11258,12 +11457,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}."
@@ -11342,7 +11549,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11441,35 +11648,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 ""
@@ -11479,8 +11662,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 ..."
@@ -11507,10 +11690,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>"
@@ -11594,8 +11774,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}."
@@ -11793,7 +11973,7 @@ 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}"
@@ -11839,6 +12019,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."
@@ -11869,19 +12058,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 ""
@@ -11903,11 +12092,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 ""
@@ -11977,18 +12178,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 ""
@@ -12131,11 +12328,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"
@@ -12149,27 +12346,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 ""
@@ -12237,8 +12429,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..."
@@ -12253,9 +12444,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}''"
@@ -12579,12 +12785,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12595,21 +12800,64 @@ 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 "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 ""
+
+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):"
@@ -12629,9 +12877,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."
@@ -12954,6 +13216,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 ""
@@ -13194,6 +13461,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."
@@ -13243,9 +13513,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 ""
@@ -13282,6 +13549,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 ""
@@ -13412,6 +13684,9 @@ msgstr "Upphækkun"
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "Tollur"
+
msgid "Motorway Link"
msgstr "Tengibraut á hraðbraut"
@@ -13502,6 +13777,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"
@@ -13520,11 +13839,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"
@@ -13535,6 +13854,9 @@ msgstr "heimreið"
msgid "parking_aisle"
msgstr "bílastæðavegur"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Bílastæðavegur"
@@ -13562,18 +13884,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 ""
@@ -13583,9 +13899,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13595,15 +13908,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 ""
@@ -13649,6 +13962,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Lámarkshraði (km/klst)"
@@ -13733,6 +14049,9 @@ msgstr "Breyti brú"
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13837,21 +14156,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 ""
@@ -13867,10 +14195,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"
@@ -13906,7 +14234,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13975,12 +14303,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 ""
@@ -13996,15 +14330,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 ""
@@ -14026,6 +14351,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -14035,6 +14369,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Smáhringtorg"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Átt"
@@ -14044,10 +14381,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"
@@ -14080,9 +14414,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr "Beygjuhringur"
@@ -14125,6 +14456,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr "Leyfileg umferð:"
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14140,6 +14477,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14209,19 +14549,16 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
-msgstr ""
-
-msgid "split_rail"
+msgid "pole"
msgstr ""
-msgid "chain"
+msgid "Guard Rail"
msgstr ""
-msgid "hedge"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14252,6 +14589,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14261,11 +14599,11 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
-msgstr "Inngangur"
+msgid "Entrance (barrier opening)"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Breyti inngang"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Hlið"
@@ -14318,12 +14656,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14384,12 +14716,21 @@ msgstr "Breyti frárennsli"
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr "Lækur"
msgid "Edit Stream"
msgstr "Breyti læk"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Skipaskurður"
@@ -14429,9 +14770,6 @@ msgstr "Breyti stíflu"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14465,6 +14803,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"
@@ -14546,18 +14899,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 ""
@@ -14633,7 +14991,7 @@ msgstr "ferðamennska"
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14657,10 +15015,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"
@@ -14672,9 +15033,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14726,6 +15084,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14738,18 +15099,32 @@ 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 ""
@@ -14849,11 +15224,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14865,11 +15238,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14888,12 +15259,12 @@ msgstr "slitlag"
msgid "underground"
msgstr ""
+msgid "rooftop"
+msgstr ""
+
msgid "Access"
msgstr "Aðgangur"
-msgid "customers"
-msgstr ""
-
msgid "Park and Ride"
msgstr ""
@@ -14921,9 +15292,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14945,10 +15313,29 @@ 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 "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"
@@ -15098,6 +15485,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr "Volt"
+
msgid "Amperage"
msgstr ""
@@ -15119,6 +15509,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15146,13 +15542,19 @@ msgstr "Leiga"
msgid "Edit Car Rental"
msgstr "Breyti bílaleigu"
-msgid "Sharing"
+msgid "Second hand"
msgstr ""
-msgid "Edit Car Sharing"
+msgid "only"
msgstr ""
-msgid "Edit Motorcycle Parking"
+msgid "Sharing"
+msgstr ""
+
+msgid "Edit Car Sharing"
+msgstr ""
+
+msgid "Edit Motorcycle Parking"
msgstr ""
msgid "Motorcycle Dealer"
@@ -15170,22 +15572,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 ""
@@ -15207,9 +15593,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Föt"
@@ -15404,6 +15787,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15434,6 +15820,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Bekkur"
@@ -15446,9 +15835,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15458,9 +15844,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr "Bygging"
@@ -15473,6 +15864,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15497,14 +15891,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"
@@ -15553,8 +15939,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"
@@ -15607,6 +15993,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 ""
@@ -15629,21 +16030,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 ""
@@ -15833,9 +16219,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr "Ferðamennska"
@@ -15857,9 +16240,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 ""
@@ -15872,6 +16261,9 @@ msgstr "stræti"
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15911,6 +16303,9 @@ msgstr ""
msgid "Information Board"
msgstr "Fræðsluskilti"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15932,22 +16327,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"
@@ -16077,49 +16484,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"
@@ -16137,6 +16538,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16149,6 +16556,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16167,37 +16577,137 @@ 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"
@@ -16287,6 +16797,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"
@@ -16368,84 +16884,168 @@ msgstr "Dýralæknir"
msgid "Edit Veterinary"
msgstr "Breyti dýralækni"
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
-msgstr "Póstkassi"
+msgid "Access rights"
+msgstr ""
-msgid "Telephone"
-msgstr "Almenningssími"
+msgid "public"
+msgstr ""
-msgid "Edit Telephone"
-msgstr "Breyti almenningssíma"
+msgid "seasonal"
+msgstr ""
-msgid "Telephone cards"
-msgstr "Símakort"
+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 "Póstkassi"
+
+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 "Almenningssími"
+
+msgid "Edit Telephone"
+msgstr "Breyti almenningssíma"
+
+msgid "Telephone cards"
+msgstr "Símakort"
+
+msgid "Emergency Phone"
+msgstr "Neyðarsími"
+
+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"
+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"
+msgstr ""
+
+msgid "Shows barometric pressure"
+msgstr ""
+
+msgid "Shows humidity"
+msgstr ""
+
+msgid "Recycling"
msgstr "Endurvinnsla"
-msgid "Edit Recycling station"
-msgstr "Breyti endurvinnslustöð"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Rafhlöður"
@@ -16471,21 +17071,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 "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16520,18 +17114,24 @@ msgstr ""
msgid "Height"
msgstr "Hæð"
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
+
msgid "Hide"
msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
-msgstr "Drykkjarvatn"
-
msgid "Edit Source of Potable Water"
msgstr ""
@@ -16563,6 +17163,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16600,117 +17203,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 ""
@@ -16744,26 +17383,27 @@ 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 ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr ""
@@ -16771,6 +17411,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "völlur"
+
+msgid "sports_centre"
+msgstr "íþróttamiðstöð"
+
+msgid "stadium"
+msgstr "íþróttaleikvangur"
+
msgid "10pin"
msgstr ""
@@ -16804,6 +17453,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 ""
@@ -16860,7 +17525,7 @@ msgid "Skating"
msgstr "Skautar"
msgid "Edit Skating"
-msgstr "Breyti skautum"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -16904,36 +17569,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 ""
@@ -16976,19 +17659,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 ""
@@ -17127,6 +17806,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 ""
@@ -17139,60 +17830,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"
@@ -17417,41 +18182,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"
@@ -17460,8 +18251,8 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
-msgstr "Eftirlitsmyndavél"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Breyti eftirlitsmyndavél"
@@ -17472,12 +18263,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 "Rafall"
@@ -17529,89 +18410,192 @@ 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 "battery charging"
+msgid "stellarator"
msgstr ""
-msgid "Power Station"
-msgstr "Orkuver"
+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 "Breyti orkuveri"
+msgid "Output forms of energy:"
+msgstr ""
msgid "Power Sub Station"
msgstr "Spennustöð"
@@ -17622,6 +18606,21 @@ 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 ""
@@ -17637,6 +18636,9 @@ msgstr "Breyti háspennustaur"
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17655,11 +18657,9 @@ msgstr "Breyti raflínu"
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17768,11 +18768,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"
@@ -17783,7 +18783,7 @@ msgstr "Breyti slátrara"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17804,6 +18804,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr "Lífræn búð"
+
msgid "Greengrocer"
msgstr ""
@@ -17816,9 +18819,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr "Lífræn búð"
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17888,7 +18888,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17909,13 +18909,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"
@@ -17924,7 +18924,6 @@ msgstr "Hljómtækjaverslun"
msgid "Edit Hifi Shop"
msgstr "Breyti hljómtækjaverslun"
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17952,6 +18951,12 @@ msgstr "Breyti gjaldeyrisskiptum"
msgid "Edit Automated Teller Machine"
msgstr "Breyti hraðbanka"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17988,10 +18993,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"
@@ -18021,7 +19047,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18033,19 +19059,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"
@@ -18081,7 +19107,7 @@ msgstr "Breyti ferðaskrifstofu"
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18294,6 +19320,12 @@ msgstr "Tindur"
msgid "Edit Peak"
msgstr "Breyti tind"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Jökull"
@@ -18333,32 +19365,26 @@ msgstr "Tré"
msgid "Edit Tree"
msgstr "Breyti tré"
-msgid "Botanical Name"
-msgstr "Fræðiheiti"
-
-msgid "Wood"
-msgstr "Skógur"
-
-msgid "Edit Wood"
-msgstr "Breyti skóg"
+msgid "broad_leaved"
+msgstr ""
-msgctxt "wood"
-msgid "coniferous"
+msgid "conifer"
msgstr ""
-msgctxt "wood"
-msgid "deciduous"
+msgid "palm"
msgstr ""
-msgctxt "wood"
-msgid "mixed"
+msgid "Botanical Name"
+msgstr "Fræðiheiti"
+
+msgid "Tree Row"
msgstr ""
-msgid "Forest"
-msgstr "Skógur (ræktaður)"
+msgid "Wood"
+msgstr "Skógur"
-msgid "Edit Forest Landuse"
-msgstr "Breyti ræktuðum skóg"
+msgid "Edit Wood"
+msgstr "Breyti skóg"
msgid "coniferous"
msgstr "barrskógur"
@@ -18369,6 +19395,12 @@ msgstr "laufskógur"
msgid "mixed"
msgstr "blandaður"
+msgid "Forest"
+msgstr "Skógur (ræktaður)"
+
+msgid "Edit Forest Landuse"
+msgstr "Breyti ræktuðum skóg"
+
msgid "Grassland"
msgstr ""
@@ -18444,6 +19476,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18498,8 +19536,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"
@@ -18510,6 +19548,9 @@ msgstr "Grafreitur"
msgid "Edit Graveyard"
msgstr "Breyti grafreit"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18585,6 +19626,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"
@@ -18621,6 +19689,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18789,21 +19869,50 @@ 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 "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 ""
@@ -18849,19 +19958,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"
@@ -18885,7 +19997,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18981,18 +20093,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 ""
@@ -19002,7 +20123,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -19011,10 +20135,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"
@@ -19032,6 +20156,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19047,28 +20174,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"
@@ -19089,19 +20216,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"
@@ -19176,10 +20303,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr "íþrótt"
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19194,9 +20324,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr "Eldsneytisstöð"
@@ -19224,6 +20351,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19269,10 +20399,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"
@@ -19284,7 +20444,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"
@@ -19302,7 +20462,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19419,19 +20579,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 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"
@@ -19450,7 +20721,46 @@ 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 "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 "Landsat"
@@ -19462,19 +20772,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 "skobbler heatmap"
@@ -19495,7 +20814,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19504,6 +20823,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19650,6 +20972,29 @@ 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 ""
@@ -19815,6 +21160,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19860,6 +21208,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -20061,6 +21442,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 ""
@@ -20082,13 +21475,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20351,10 +21738,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20558,7 +21948,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"
@@ -20829,15 +22219,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -21008,6 +22389,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 ""
@@ -21026,12 +22410,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21167,6 +22545,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 ""
@@ -21184,6 +22565,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 ""
@@ -21410,7 +22794,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."
@@ -21460,7 +22847,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21645,6 +23032,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21684,27 +23136,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 ""
@@ -22782,9 +24216,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 ""
@@ -23431,9 +24882,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Villa kom upp: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23488,18 +24936,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 ""
@@ -23846,6 +25282,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23997,6 +25454,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 ""
@@ -24314,9 +25774,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24532,6 +25989,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 ""
@@ -24564,15 +26024,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 ""
@@ -24687,9 +26163,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24868,19 +26341,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"
@@ -25096,6 +26569,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 ""
@@ -25132,6 +26694,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..."
@@ -25284,9 +26849,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26272,9 +27834,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26553,9 +28112,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 45e1f42..e26cad1 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-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-08-30 14:52+0000\n"
-"Last-Translator: Davide <Unknown>\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-08-31 04:32+0000\n"
-"X-Generator: Launchpad (build 16750)\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,6 +54,9 @@ 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}"
@@ -63,11 +66,14 @@ 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"
@@ -82,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"
@@ -123,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"
@@ -138,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"
@@ -168,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."
@@ -194,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."
@@ -270,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"
@@ -295,7 +298,10 @@ msgid "conflict"
msgstr "conflitto"
msgid "download"
-msgstr "scarica"
+msgstr "scaricamento"
+
+msgid "problem"
+msgstr "problema"
msgid "problem"
msgstr "problema"
@@ -309,6 +315,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}"
@@ -366,10 +375,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"
@@ -419,7 +428,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"
@@ -452,7 +461,7 @@ 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 "
+"<html>Quest''azione richiederà {0} richieste di scarico distinte.<br>Si "
"vuole procedere?</html>"
msgid "Download data"
@@ -557,10 +566,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 "
@@ -589,8 +601,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"
@@ -688,11 +699,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"
@@ -863,16 +874,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}"
@@ -1049,13 +1061,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"
@@ -1070,16 +1082,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 "
@@ -1099,9 +1106,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>"
@@ -1229,7 +1233,7 @@ msgid "Restart the application."
msgstr "Riavvia l''applicazione."
msgid "Click to restart later."
-msgstr "Cliccare per riavviare in seguito."
+msgstr "Clicca per riavviare in seguito."
msgid "Reverse way"
msgstr "Inverti percorso"
@@ -1283,9 +1287,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"
@@ -1438,19 +1439,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"
@@ -1554,6 +1554,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"
@@ -1634,9 +1659,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"
@@ -1811,7 +1836,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 "Download Compressed OSM Change"
msgstr "Scarica modifica OSM compressa"
@@ -1867,6 +1904,9 @@ 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)"
@@ -1880,14 +1920,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 "
@@ -1911,14 +1951,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"
@@ -2007,7 +2047,7 @@ msgid "Finish drawing."
msgstr "Termina tracciamento."
msgid "FIX"
-msgstr "FIX"
+msgstr "CORREZIONE"
msgid "draw angle snap"
msgstr "disegna angolo con scatto"
@@ -2086,7 +2126,7 @@ 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."
@@ -2095,30 +2135,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"
@@ -2497,14 +2537,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-"
@@ -2612,6 +2651,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"
@@ -2667,7 +2710,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à"
@@ -2790,13 +2833,13 @@ msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr "Atteso <i>min</i>/<i>max</i> dopo ''timestamp''"
msgid "Range of primitive ids expected"
-msgstr "E'' atteso un intervallo di identificativi delle primitive"
+msgstr "È atteso un intervallo di identificativi delle primitive"
msgid "Range of changeset ids expected"
-msgstr "E'' atteso un intervallo di identificativi dei gruppi di modifiche"
+msgstr "È atteso un intervallo di identificativi dei gruppi di modifiche"
msgid "Range of versions expected"
-msgstr "E'' atteso un intervallo di versioni"
+msgstr "È atteso un intervallo di versioni"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2829,11 +2872,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 "
@@ -2886,9 +2928,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"
@@ -2929,6 +2971,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}"
@@ -2965,11 +3010,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"
@@ -2993,11 +3038,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}''"
@@ -3016,7 +3061,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}"
@@ -3079,11 +3124,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?"
@@ -3115,6 +3160,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"
@@ -3183,12 +3231,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"
@@ -3217,11 +3264,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"
@@ -3240,11 +3287,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}"
@@ -3279,23 +3329,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 "
@@ -3305,11 +3354,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 "
@@ -3318,18 +3367,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 "
@@ -3347,11 +3394,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}"
@@ -3382,14 +3429,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"
@@ -3561,11 +3606,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."
@@ -3650,7 +3694,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}''."
@@ -3681,8 +3725,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)"
@@ -3694,7 +3738,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}''"
@@ -3726,11 +3770,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"
@@ -3771,14 +3810,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"
@@ -3795,6 +3839,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"
@@ -3845,7 +3898,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"
@@ -3856,6 +3909,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"
@@ -3943,6 +3999,15 @@ 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"
@@ -4019,6 +4084,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"
@@ -4072,7 +4145,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"
@@ -4080,15 +4153,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})"
@@ -4122,16 +4195,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}"
@@ -4202,7 +4275,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 ""
@@ -4212,7 +4285,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."
@@ -4276,8 +4349,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"
@@ -4313,7 +4386,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\""
@@ -4354,6 +4427,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}"
@@ -4384,9 +4460,6 @@ msgstr "building"
msgid "area"
msgstr "area"
-msgid "Unclosed way"
-msgstr "Percorso non chiuso"
-
msgid "Unconnected ways"
msgstr "Percorsi non connessi"
@@ -4414,12 +4487,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''"
@@ -4484,28 +4557,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)"
@@ -4528,7 +4579,7 @@ msgid "highway"
msgstr "strada"
msgid "railway"
-msgstr "Linea ferroviaria"
+msgstr "Ferrovia"
msgid "waterway"
msgstr "Corso d’acqua"
@@ -4583,7 +4634,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"
@@ -4609,14 +4660,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"
@@ -4862,6 +4913,19 @@ 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"
@@ -4872,7 +4936,10 @@ 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 edit toolbar"
msgstr "Nascondi la barra degli strumenti di modifica"
@@ -4929,9 +4996,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)"
@@ -4961,27 +5027,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)"
@@ -5044,11 +5096,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 "
@@ -5304,6 +5356,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."
@@ -5311,6 +5366,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."
@@ -5318,17 +5376,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."
@@ -5336,6 +5403,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"
@@ -5352,8 +5422,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ù"
@@ -5408,16 +5478,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"
@@ -5595,7 +5655,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"
@@ -5705,18 +5765,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 ""
@@ -5873,11 +5933,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"
@@ -5907,8 +5967,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>"
@@ -5928,7 +5988,7 @@ msgid "Enable filter"
msgstr "Abilita filtro"
msgid "Multikey: {0}"
-msgstr "Multi-chiave: {0}"
+msgstr "Chiave multipla: {0}"
msgid "Hide filter"
msgstr "Nascondi filtro"
@@ -6016,7 +6076,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"
@@ -6030,7 +6090,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"
@@ -6150,7 +6210,7 @@ msgid ""
msgstr ""
"\n"
"\n"
-"> ignoro \"{0}\" (non attivo)"
+"> tralascio \"{0}\" (non attivo)"
msgid ""
"\n"
@@ -6291,18 +6351,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."
@@ -6316,6 +6375,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"
@@ -6401,6 +6463,39 @@ msgstr "Lo stile è attualmente attivo?"
msgid "No"
msgstr "No"
+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 ""
+"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"
@@ -6462,7 +6557,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 "Side buttons"
msgstr "Pulsanti laterali"
@@ -6495,11 +6602,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 "
@@ -6677,11 +6783,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"
@@ -7025,11 +7128,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 ""
@@ -7106,35 +7209,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"
@@ -7148,14 +7263,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 ""
@@ -7274,7 +7389,10 @@ 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 "Apply recent tag {0}"
msgstr "Applica etichetta recente {0}"
@@ -7320,10 +7438,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"
@@ -7413,7 +7529,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"
@@ -7504,13 +7620,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 "
@@ -7543,14 +7659,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"
@@ -7688,6 +7804,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"
@@ -7823,10 +7962,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."
@@ -7846,21 +7985,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, "
@@ -7873,29 +7999,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"
@@ -7921,7 +8027,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"
@@ -8009,9 +8115,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 ""
@@ -8034,37 +8139,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 ""
@@ -8072,19 +8177,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}"
@@ -8096,7 +8201,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}"
@@ -8124,6 +8229,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"
@@ -8221,26 +8329,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"
@@ -8262,6 +8368,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:"
@@ -8333,11 +8445,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"
@@ -8423,11 +8534,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 "
@@ -8444,10 +8555,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"
@@ -8466,14 +8576,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"
@@ -8483,7 +8593,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"
@@ -8607,7 +8717,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 "
@@ -8698,12 +8808,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 "
@@ -8719,6 +8823,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"
@@ -8735,6 +8860,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"
@@ -8742,11 +8886,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 ..."
@@ -8834,20 +8978,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 "
@@ -8869,7 +9012,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>"
@@ -8879,23 +9022,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..."
@@ -8908,6 +9049,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>"
@@ -8928,10 +9072,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:"
@@ -9085,16 +9228,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"
@@ -9123,10 +9266,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"
@@ -9455,12 +9596,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"
@@ -9475,8 +9616,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"
@@ -9507,9 +9648,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 ..."
@@ -9528,6 +9666,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"
@@ -9587,6 +9728,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"
@@ -9645,11 +9792,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}"
@@ -9671,9 +9818,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"
@@ -9684,7 +9828,7 @@ msgid "To"
msgstr "A"
msgid "No timestamp"
-msgstr "Nessuna marcatura temporale"
+msgstr "Nessuna marca temporale"
msgid "Select to download OSM data."
msgstr "Selezionare per scaricare i dati OSM."
@@ -9717,10 +9861,10 @@ msgid "track and waypoints"
msgstr "tracciato e punti del percorso"
msgid "Click to download"
-msgstr "Cliccare per scaricare"
+msgstr "Clicca per scaricare"
msgid "Click to cancel"
-msgstr "Cliccare per annullare"
+msgstr "Clicca per annullare"
msgid "Download from OSM along this track"
msgstr "Scarica da OSM lungo questo tracciato"
@@ -9757,8 +9901,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"
@@ -9767,7 +9911,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."
@@ -9776,7 +9920,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."
@@ -9796,36 +9940,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"
@@ -9841,48 +9985,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..."
@@ -9894,7 +10034,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] ""
@@ -9902,10 +10042,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"
@@ -9914,11 +10053,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:"
@@ -9957,11 +10095,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 ""
@@ -10051,7 +10189,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>"
@@ -10061,8 +10199,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"
@@ -10097,7 +10235,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>"
@@ -10122,7 +10260,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>"
@@ -10173,7 +10311,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 "
@@ -10195,9 +10333,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}''''"
@@ -10356,25 +10493,25 @@ msgstr ""
"l''autorizzazione sul server OSM.<br><br>Il token di accesso è: </html>"
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 ""
@@ -10382,7 +10519,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>"
@@ -10395,10 +10532,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"
@@ -10451,22 +10588,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 ""
@@ -10482,7 +10619,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."
@@ -10500,28 +10637,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 ""
@@ -10575,9 +10712,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:"
@@ -10938,7 +11075,7 @@ msgid ""
"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 "
+"<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>"
@@ -11024,6 +11161,41 @@ 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"
+
+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: NonDefalut"
msgstr "Sfondo avanzato: non predefinito"
@@ -11096,6 +11268,9 @@ 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"
@@ -11160,9 +11335,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"
@@ -11245,7 +11427,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)"
@@ -11260,7 +11442,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"
@@ -11349,8 +11531,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 ""
@@ -11671,6 +11852,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"
@@ -11743,9 +11930,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"
@@ -11862,7 +12048,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})"
@@ -12037,21 +12223,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"
@@ -12073,6 +12244,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}''''"
@@ -12121,7 +12307,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>"
@@ -12141,11 +12327,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:"
@@ -12153,29 +12339,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. "
@@ -12192,7 +12381,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"
@@ -12201,12 +12390,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>"
@@ -12270,18 +12459,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"
@@ -12353,8 +12536,8 @@ msgstr "Applica preimpostazione"
msgid "New relation"
msgstr "Nuova relazione"
-msgid "Change Properties"
-msgstr "Modifica Proprietà"
+msgid "Change Tags"
+msgstr "Cambia etichette"
msgid "Unknown requisite: {0}"
msgstr "Requisito sconosciuto: {0}"
@@ -12442,9 +12625,6 @@ 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}: "
@@ -12463,6 +12643,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 (*.*)"
@@ -12498,9 +12688,60 @@ 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 ""
+"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"
+
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 ""
+"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 ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -12537,11 +12778,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."
@@ -12593,40 +12834,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..."
@@ -12716,20 +12953,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."
@@ -12745,16 +12985,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}."
@@ -12768,7 +13016,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."
@@ -12824,7 +13072,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"
@@ -12844,8 +13092,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!"
@@ -12865,7 +13113,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 ""
@@ -12958,70 +13206,36 @@ 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}''."
+"Unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
msgstr ""
-"valore non valido per attributo obbligatorio ''{0}'' di tipo long, ricevuto "
-"''{1}''"
+"Elemento iniziale ''{0}'' non supportato nel contenuto del gruppo di "
+"modifiche alla posizione ({1},{2}). Tralascio."
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}''."
+"Illegal document structure. Found node, way, or relation outside of "
+"''create'', ''modify'', or ''delete''."
msgstr ""
-"Valore non permesso per l''attributo ''{0}'' di tipo double. Ottenuto "
-"''{1}''."
+"Struttura del documento non valida. È stato trovato un nodo, percorso o "
+"relazione al di fuori di un ''create'', ''modify'' o ''delete''."
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 ""
-"valore non valido per attributo obbligatorio ''{0}'' di tipo booleano, "
-"ricevuto ''{1}''"
+"Elemento finale ''{0}'' non supportato nel contenuto del gruppo di modifiche "
+"alla posizione ({1},{2}). Tralascio."
-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 "Parsing changeset content ..."
+msgstr "Analisi del contenuto del gruppo di modifiche ..."
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
msgstr ""
-"Attenzione: elemento iniziale ''''{0}'''' non supportato nel contenuto del "
-"gruppo di modifiche alla posizione ({1},{2}). Ignorato."
-
-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 "
-"relazione al di fuori di un ''create'', ''modify'' o ''delete''."
-
-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}). Ignorato."
-
-msgid "Parsing changeset content ..."
-msgstr "Analisi del contenuto del gruppo di modifiche ..."
-
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
-"Valore non valido per l''attributo ''''{0}''''. Ottenuto ''''{1}''''."
+"Valore non valido per l''attributo ''''{0}''''. Ottenuto ''''{1}''''."
msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
msgstr ""
@@ -13037,8 +13251,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..."
@@ -13048,31 +13262,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>"
+"<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"
@@ -13140,8 +13349,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"
@@ -13154,11 +13363,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}."
@@ -13228,13 +13437,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."
@@ -13291,8 +13500,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)"
@@ -13369,10 +13577,15 @@ 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 "RemoteControl::Accepting connections on port {0}"
msgstr "Controllo remoto::Accettazione connessioni sulla porta {0}"
@@ -13381,15 +13594,14 @@ 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 "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}"
@@ -13404,7 +13616,7 @@ msgid ""
"Remote Control has been asked to report its supported features. This enables "
"web sites to guess a running JOSM version"
msgstr ""
-"E'' stato richiesto a controllo remoto di elencare le sue caratteristiche "
+"È stato richiesto a controllo remoto di elencare le sue caratteristiche "
"supportate. Questo permette ai siti web di stimare la versione JOSM in "
"esecuzione"
@@ -13412,31 +13624,39 @@ 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?"
@@ -13448,7 +13668,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 ""
@@ -13464,20 +13684,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: "
@@ -13502,6 +13722,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"
@@ -13509,6 +13738,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}''."
@@ -13553,7 +13785,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"
@@ -13564,39 +13796,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"
@@ -13605,7 +13837,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"
@@ -13629,7 +13861,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>"
@@ -13648,13 +13880,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 "
@@ -13759,7 +13991,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 ""
@@ -13778,19 +14010,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"
@@ -13798,31 +14029,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}''"
@@ -13830,7 +14059,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}."
@@ -13839,7 +14068,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?"
@@ -13900,11 +14129,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 ""
@@ -13920,13 +14148,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}''''"
@@ -13939,7 +14182,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}''''"
@@ -13967,8 +14210,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."
@@ -13978,7 +14221,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:"
@@ -14204,7 +14447,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>"
@@ -14213,7 +14456,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>"
@@ -14221,11 +14464,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}'' "
@@ -14233,7 +14476,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>"
@@ -14242,8 +14485,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"
@@ -14254,7 +14497,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>"
@@ -14262,14 +14505,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 ""
@@ -14286,7 +14529,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 ""
@@ -14311,16 +14554,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 "
@@ -14396,17 +14638,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 "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 access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+"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}"
+"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]"
@@ -14418,16 +14657,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):"
@@ -14455,8 +14741,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 "
@@ -14574,7 +14874,7 @@ msgstr ""
"dati"
msgid "town"
-msgstr "città"
+msgstr "paese"
msgctxt "landuse"
msgid "forest"
@@ -14614,7 +14914,7 @@ msgstr "multi-poligono"
msgctxt "Relation type"
msgid "network"
-msgstr "rete (network)"
+msgstr "rete"
msgctxt "Relation type"
msgid "public_transport"
@@ -14646,11 +14946,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"
@@ -14806,6 +15106,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 ""
@@ -14882,7 +15189,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"
@@ -14892,7 +15199,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."
@@ -15077,8 +15384,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)."
@@ -15086,7 +15393,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"
@@ -15130,11 +15437,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."
@@ -15194,14 +15504,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."
@@ -15227,7 +15535,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). "
@@ -15244,6 +15552,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"
@@ -15271,7 +15586,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."
@@ -15280,7 +15595,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"
@@ -15388,6 +15703,9 @@ msgstr "Terrapieno"
msgid "Lit"
msgstr "Illuminazione stradale"
+msgid "Toll"
+msgstr "Pedaggio"
+
msgid "Motorway Link"
msgstr "Svincolo autostradale"
@@ -15413,7 +15731,7 @@ msgid "Edit Primary Road"
msgstr "Modifica strada primaria"
msgid "Incline"
-msgstr "Rampa"
+msgstr "Pendenza"
msgid "10%"
msgstr "10%"
@@ -15464,7 +15782,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)"
@@ -15475,11 +15793,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"
@@ -15493,11 +15855,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"
@@ -15508,6 +15870,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"
@@ -15521,7 +15886,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"
@@ -15535,18 +15900,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)"
@@ -15556,9 +15915,6 @@ msgstr "Divieti alla modalità di trasporto"
msgid "General Access"
msgstr "Accesso Generale"
-msgid "destination"
-msgstr "destinazione"
-
msgid "delivery"
msgstr "carico e scarico"
@@ -15568,15 +15924,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"
@@ -15622,6 +15978,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)"
@@ -15662,7 +16021,7 @@ msgid "motorway"
msgstr "autostrada"
msgid "motorway_link"
-msgstr "motorway_link"
+msgstr "svincolo autostradale"
msgid "trunk"
msgstr "superstrada"
@@ -15695,7 +16054,7 @@ msgid "service"
msgstr "strada di servizio"
msgid "bus_guideway"
-msgstr "autobus a guida vincolata"
+msgstr "bus_guideway"
msgid "construction"
msgstr "in costruzione"
@@ -15706,6 +16065,9 @@ msgstr "Modifica ponte"
msgid "viaduct"
msgstr "viadotto"
+msgid "suspension"
+msgstr "sospensione"
+
msgid "swing"
msgstr "girevole"
@@ -15826,20 +16188,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"
@@ -15856,10 +16227,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"
@@ -15884,7 +16255,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"
@@ -15895,8 +16266,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"
@@ -15917,19 +16288,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"
@@ -15938,7 +16309,7 @@ msgid "Motorway Junction"
msgstr "Uscita autostradale"
msgid "Edit Motorway Junction"
-msgstr "Modifica un'uscita autostradale"
+msgstr "Modifica uscita autostradale"
msgid "Number"
msgstr "Numero"
@@ -15964,12 +16335,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"
@@ -15985,15 +16362,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)"
@@ -16015,6 +16383,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"
@@ -16024,6 +16401,9 @@ msgstr "Dare precedenza"
msgid "Mini-roundabout"
msgstr "Mini-rotatoria"
+msgid "Edit Mini-Roundabout"
+msgstr "Modifica mini-rotatoria"
+
msgid "Direction"
msgstr "Direzione"
@@ -16033,17 +16413,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"
@@ -16067,10 +16444,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"
@@ -16085,7 +16459,7 @@ msgid "Second Name"
msgstr "Secondo nome"
msgid "Speed Camera"
-msgstr "Rilevatore di velocità"
+msgstr "Autovelox"
msgid "Grit Bin"
msgstr "Cassone di sabbia"
@@ -16114,6 +16488,12 @@ msgstr "Modifica blocco"
msgid "Allowed traffic:"
msgstr "Traffico permesso:"
+msgid "Material"
+msgstr "Materiale"
+
+msgid "stone"
+msgstr "pietra"
+
msgid "Bollard"
msgstr "Colonnina"
@@ -16129,6 +16509,9 @@ msgstr "a scomparsa"
msgid "removable"
msgstr "rimovibile"
+msgid "plastic"
+msgstr "plastica"
+
msgid "Cycle Barrier"
msgstr "Barriera per biciclette"
@@ -16154,10 +16537,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"
@@ -16198,20 +16581,17 @@ msgstr "rete"
msgid "electric"
msgstr "elettrico"
-msgid "roundpole"
-msgstr "staccionata"
-
-msgid "split_rail"
-msgstr "staccionata"
+msgid "pole"
+msgstr "palo"
-msgid "chain"
-msgstr "rete"
+msgid "Guard Rail"
+msgstr "Barriera di contenimento (guard rail)"
-msgid "hedge"
-msgstr "siepe"
+msgid "Edit Guard Rail"
+msgstr "Modifica barriera di contenimento (guard rail)"
-msgid "pole"
-msgstr "palo"
+msgid "wire"
+msgstr "filo metallico"
msgid "Guard Rail"
msgstr "Barriera di contenimento (guard rail)"
@@ -16241,6 +16621,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr "Fosso"
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr "Modifica fosso"
@@ -16250,11 +16631,11 @@ msgstr "Cordolo"
msgid "Edit Kerb"
msgstr "Modifica cordolo"
-msgid "Entrance"
+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"
@@ -16307,12 +16688,6 @@ msgstr "strettoia"
msgid "stepover"
msgstr "scavalco"
-msgid "Material"
-msgstr "Materiale"
-
-msgid "stone"
-msgstr "pietra"
-
msgid "Turnstile"
msgstr "Tornello"
@@ -16373,12 +16748,21 @@ msgstr "Modifica canale di scolo"
msgid "Ditch"
msgstr "Fosso"
+msgid "Edit Ditch"
+msgstr "Modifica fosso"
+
msgid "Stream"
msgstr "Torrente"
msgid "Edit Stream"
msgstr "Modifica un torrente"
+msgid "Wadi"
+msgstr "Uadi"
+
+msgid "Edit Wadi"
+msgstr "Modifica uadi"
+
msgid "Canal"
msgstr "Canale"
@@ -16418,9 +16802,6 @@ msgstr "Modifica una diga"
msgid "Groyne"
msgstr "Frangiflutti"
-msgid "Edit Groyne"
-msgstr "Modifica frangiflutti"
-
msgid "Breakwater"
msgstr "Frangifrutti"
@@ -16454,6 +16835,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"
@@ -16535,18 +16931,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"
@@ -16622,8 +17023,8 @@ msgstr "turismo"
msgid "freight"
msgstr "merci"
-msgid "Service/Type"
-msgstr "Servizio/Tipo"
+msgid "Service type"
+msgstr "Tipo servizio"
msgid "yard"
msgstr "deposito locomotive"
@@ -16646,11 +17047,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"
@@ -16661,9 +17065,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"
@@ -16715,6 +17116,9 @@ msgstr "Modifica ferrovia abbandonata"
msgid "Level Crossing"
msgstr "Passaggio a livello"
+msgid "Edit Level Crossing"
+msgstr "Modifica passaggio a livello"
+
msgid "Supervised"
msgstr "Custodito"
@@ -16727,20 +17131,34 @@ 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 "mezzo"
+msgstr "parziale"
+msgctxt "crossing:barrier"
msgid "full"
msgstr "completo"
+msgctxt "crossing:barrier"
msgid "double_half"
msgstr "doppio"
msgid "Crossing"
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"
@@ -16838,13 +17256,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"
@@ -16854,11 +17270,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Modifica stazione"
-msgctxt "aerialway"
msgid "Pylon"
msgstr "Pilone"
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr "Modifica pilone"
@@ -16877,12 +17291,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"
@@ -16910,9 +17324,6 @@ msgstr "Posto auto"
msgid "Edit Parking space"
msgstr "Modifica posto auto"
-msgid "rooftop"
-msgstr "sul tetto"
-
msgid "Capacity"
msgstr "Capacità"
@@ -16934,14 +17345,35 @@ 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 "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Ma-Do 08:00-15:00;Sa 08:00-12:00"
+msgid "Sa-Su 00:00-24:00"
+msgstr "Sab-Dom 00:00-24:00"
-msgid "Parking entrance"
-msgstr "Entrata parcheggio"
+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"
msgid "Edit Parking entrance"
msgstr "Modifica entrata parcheggio"
@@ -17087,6 +17519,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"
@@ -17108,6 +17543,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"
@@ -17135,6 +17576,12 @@ msgstr "Noleggio"
msgid "Edit Car Rental"
msgstr "Modifica noleggio automobili"
+msgid "Second hand"
+msgstr "Usate"
+
+msgid "only"
+msgstr "solo"
+
msgid "Sharing"
msgstr "Condivisione"
@@ -17159,22 +17606,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"
@@ -17196,9 +17627,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Componenti"
-
msgid "Clothes"
msgstr "Abbigliamento"
@@ -17242,7 +17670,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"
@@ -17259,13 +17687,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 "Public transport route"
-msgstr "Percorso trasporto pubblico"
+msgstr "Itinerario trasporto pubblico"
msgid "Edit Route"
msgstr "Modifica un itinerario"
@@ -17348,22 +17776,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"
@@ -17387,31 +17815,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"
@@ -17425,6 +17856,9 @@ msgstr "Funicolare"
msgid "Ferry"
msgstr "Traghetto"
+msgid "Edit Platform"
+msgstr "Modifica banchina"
+
msgid "Bench"
msgstr "Panchina"
@@ -17437,21 +17871,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"
@@ -17462,7 +17898,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"
@@ -17486,15 +17925,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"
@@ -17503,7 +17934,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"
@@ -17512,10 +17943,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)"
@@ -17527,25 +17958,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"
@@ -17598,6 +18029,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"
@@ -17606,7 +18052,7 @@ msgid "Edit Terminal Gate"
msgstr "Modifica varco terminal aeroportuale"
msgid "Facilities"
-msgstr "Strutture"
+msgstr "Servizi"
msgid "Accommodation"
msgstr "Accoglienza"
@@ -17620,21 +18066,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"
@@ -17824,9 +18255,6 @@ msgstr "Locale di spogliarello"
msgid "Edit Stripclub"
msgstr "Modifica locale di spogliarello"
-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 "Tourism"
msgstr "Turismo"
@@ -17848,9 +18276,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"
@@ -17863,6 +18297,9 @@ msgstr "strada"
msgid "scheme"
msgstr "schema"
+msgid "toposcope"
+msgstr "Tavola orientamento"
+
msgid "Shown Area"
msgstr "Area visualizzata"
@@ -17902,6 +18339,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"
@@ -17923,23 +18363,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"
@@ -18068,128 +18520,233 @@ msgstr "Opera d''arte"
msgid "Edit Artwork"
msgstr "Modifica opera d''arte"
-msgid "Place of Worship"
-msgstr "Luogo di culto"
-
-msgid "Edit Place of Worship"
-msgstr "Modifica Luogo di culto"
-
-msgid "Religion"
-msgstr "Religione"
+msgid "Recording Studio"
+msgstr "Studio di registrazione"
-msgid "bahai"
-msgstr "Bahaista"
+msgid "Edit Studio"
+msgstr "Modifica studio di registrazione"
-msgid "buddhist"
-msgstr "Buddista"
+msgid "audio"
+msgstr "audio"
-msgid "christian"
-msgstr "Cristiana"
+msgid "video"
+msgstr "video"
-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 "roman_catholic"
-msgstr "Romana cattolica"
+msgstr "romana cattolica"
-msgid "shia"
-msgstr "Sciita"
+msgid "russian_orthodox"
+msgstr "russa ortodossa"
-msgid "sunni"
-msgstr "Sunnita"
+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"
@@ -18278,6 +18835,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"
@@ -18321,7 +18884,7 @@ msgid "Pharmacy"
msgstr "Farmacia"
msgid "Edit Pharmacy"
-msgstr "Modifica Farmacia"
+msgstr "Modifica farmacia"
msgid "Dispensing"
msgstr "Vendita medicinali con obbligo di prescrizione"
@@ -18359,12 +18922,66 @@ msgstr "Veterinario"
msgid "Edit Veterinary"
msgstr "Modifica veterinario"
-msgid "Drinking water"
-msgstr "Acqua potabile"
+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"
@@ -18374,6 +18991,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"
@@ -18383,30 +19024,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à"
@@ -18435,8 +19082,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"
@@ -18462,21 +19109,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 "plastic"
-msgstr "plastica"
-
msgid "Amount of Seats"
msgstr "Quantità di posti"
@@ -18492,7 +19133,7 @@ msgstr "riparo da maltempo"
msgctxt "shelter"
msgid "public_transport"
-msgstr "trasporto pubblico"
+msgstr "trasporto pubblico (public_transport)"
msgctxt "shelter"
msgid "picnic_shelter"
@@ -18511,8 +19152,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 "piccola"
+
+msgctxt "height"
+msgid "full"
+msgstr "alta"
msgid "Hide"
msgstr "Nascondi"
@@ -18520,9 +19170,6 @@ msgstr "Nascondi"
msgid "Lock"
msgstr "Blocco"
-msgid "Drinking Water"
-msgstr "Acqua potabile"
-
msgid "Edit Source of Potable Water"
msgstr "Modifica sorgente di acqua potabile"
@@ -18554,6 +19201,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"
@@ -18591,117 +19241,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"
@@ -18735,33 +19421,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"
@@ -18795,6 +19491,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"
@@ -18805,7 +19517,7 @@ msgid "Equestrian"
msgstr "Equitazione"
msgid "Edit Equestrian"
-msgstr "Modificare Equitazione"
+msgstr "Modifica equitazione"
msgctxt "riding"
msgid "pitch"
@@ -18845,13 +19557,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"
@@ -18860,13 +19572,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"
@@ -18875,7 +19587,7 @@ msgid "water_park"
msgstr "parco acquatico"
msgid "Edit Skiing"
-msgstr "Modificare Sci"
+msgstr "Modifica sci"
msgid "Piste type"
msgstr "Tipo di pista"
@@ -18895,38 +19607,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"
@@ -18941,7 +19671,7 @@ msgid "Soccer"
msgstr "Calcio"
msgid "Edit Soccer"
-msgstr "Modifica Calcio"
+msgstr "Modifica calcio"
msgid "Australian Football"
msgstr "Football australiano"
@@ -18956,10 +19686,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"
@@ -18967,19 +19697,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"
@@ -19005,7 +19731,7 @@ msgid "Basketball"
msgstr "Pallacanestro"
msgid "Edit Basketball"
-msgstr "Modifica Pallacanestro"
+msgstr "Modifica pallacanestro"
msgid "Volleyball"
msgstr "Pallavolo"
@@ -19026,7 +19752,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)"
@@ -19035,22 +19761,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"
@@ -19062,13 +19788,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"
@@ -19080,13 +19806,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"
@@ -19118,6 +19844,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"
@@ -19130,59 +19868,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"
@@ -19408,42 +20220,68 @@ 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 "Radiation"
+msgstr "Radiazioni"
+
+msgid "Seismic Activity"
+msgstr "Attività sismiche"
+
+msgid "Recording:"
+msgstr "Registrazione:"
+
+msgid "Automated"
+msgstr "Automatica"
+
+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"
@@ -19451,8 +20289,8 @@ msgstr "Punto geodetico o altra stazione fissa"
msgid "Edit Survey Point"
msgstr "Modifica punto geodetico o altra stazione fissa"
-msgid "Surveillance"
-msgstr "Telecamera di sorveglianza"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Modifica telecamera di sorveglianza"
@@ -19463,12 +20301,103 @@ 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"
@@ -19520,89 +20449,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"
-msgid "run-of-the-river"
-msgstr "flusso fluviale"
+msgctxt "generator method"
+msgid "run-of-the-river"
+msgstr "a filo d''acqua"
+
+msgctxt "generator method"
+msgid "stream"
+msgstr "torrente"
+
+msgctxt "generator method"
+msgid "thermal"
+msgstr "termico"
+
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr "stoccaggio acqua pompata"
+
+msgctxt "generator method"
+msgid "water-storage"
+msgstr "stoccaggio acqua"
+
+msgid "Generator Type"
+msgstr "Tipo di generatore"
+
+msgid "combined_cycle"
+msgstr "ciclo combinato"
+
+msgid "gas combustion"
+msgstr "gas di combustione"
+
+msgid "francis_turbine"
+msgstr "turbina Francis"
+
+msgid "gas_turbine"
+msgstr "turbina a gas"
+
+msgid "biogas, biomass, gas, waste combustion"
+msgstr "biogas, biomasse, gas, combustione rifiuti"
+
+msgid "heat_pump"
+msgstr "pompa di calore"
+
+msgid "horizontal_axis"
+msgstr "horizontal_axis"
+
+msgid "tidal steam / wind"
+msgstr "flusso di marea / vento"
+
+msgid "kaplan_turbine"
+msgstr "turbina Kaplan"
+
+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 "hygro run-of-the-river / hydro water-storage"
+msgstr "a filo d''acqua / stoccaggio acqua"
+
+msgid "reciprocating_engine"
+msgstr "motore a pistoni"
+
+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 "thermal"
-msgstr "termica"
+msgid "tokamak"
+msgstr "tokamak"
-msgid "Output forms of energy"
-msgstr "Forme di uscita dell’energia"
+msgid "vertical_axis"
+msgstr "vertical_axis"
-msgid "electricity"
-msgstr "elettricità"
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr "Reattore nucleare ad acqua bollente 1 (BWR-1)"
-msgid "2 W"
-msgstr "2 W"
+msgid "nuclear fission"
+msgstr "fissione nucleare"
-msgid "3 kW"
-msgstr "3 kW"
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr "Reattore nucleare ad acqua bollente 2 (BWR-2)"
-msgid "5 MW"
-msgstr "5 MW"
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr "Reattore nucleare ad acqua bollente 3 (BWR-3)"
-msgid "7 GW"
-msgstr "7 GW"
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr "Reattore nucleare ad acqua bollente 4 (BWR-4)"
-msgid "hot water"
-msgstr "acqua calda"
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr "Reattore nucleare ad acqua bollente 5 (BWR-5)"
-msgid "hot air"
-msgstr "aria calda"
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr "Reattore nucleare ad acqua bollente 6 (BWR-6)"
-msgid "cold water"
-msgstr "acqua fredda"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr "CANada Deuterium Uranium reactor (CANDU)"
-msgid "cold air"
-msgstr "aria fredda"
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr "China Pressurized Reactor (CPR-1000)"
-msgid "compressed air"
-msgstr "aria compressa"
+msgid "European Pressurized Reactor (EPR)"
+msgstr "European Pressurized Reactor (EPR)"
-msgid "steam"
-msgstr "vapore"
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr "Fusione a confinamento inerziale (IFC)"
-msgid "vacuum"
-msgstr "vuoto"
+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 "battery charging"
-msgstr "ricarica batterie"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr "Reattore Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
-msgid "Power Station"
-msgstr "Stazione elettrica"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr "Reattore Vodo-Vodyanoi Energetichesky (VVER)"
-msgid "Edit Power Station"
-msgstr "Modifica stazione elettrica"
+msgid "Output forms of energy:"
+msgstr "Forme di energia in uscita:"
msgid "Power Sub Station"
msgstr "Sottostazione elettrica"
@@ -19613,6 +20646,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"
@@ -19623,16 +20671,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"
@@ -19646,13 +20697,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"
@@ -19730,10 +20779,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"
@@ -19759,10 +20808,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"
@@ -19774,8 +20823,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"
@@ -19795,6 +20844,9 @@ msgstr "Mercato"
msgid "Edit Marketplace"
msgstr "Modifica mercato"
+msgid "Organic"
+msgstr "Prodotti biologici"
+
msgid "Greengrocer"
msgstr "Fruttivendolo"
@@ -19807,9 +20859,6 @@ msgstr "Vendita diretta prodotti agricoli"
msgid "Edit Farm Stand"
msgstr "Modifica vendita diretta prodotti agricoli"
-msgid "Organic"
-msgstr "Prodotti biologici"
-
msgid "Edit Organic/Bio"
msgstr "Modifica prodotti biologici"
@@ -19879,7 +20928,7 @@ msgstr "Modifica sarto"
msgid "Fabric"
msgstr "Merceria"
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr "Modifica merceria"
msgid "Electronic"
@@ -19900,14 +20949,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"
@@ -19915,9 +20964,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"
@@ -19943,6 +20991,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"
@@ -19979,11 +21033,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"
@@ -20012,8 +21087,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"
@@ -20024,20 +21099,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"
@@ -20072,8 +21147,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"
@@ -20094,7 +21169,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"
@@ -20285,6 +21360,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"
@@ -20324,26 +21405,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"
@@ -20351,15 +21441,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"
@@ -20435,6 +21516,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"
@@ -20490,29 +21577,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)"
@@ -20527,10 +21617,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"
@@ -20577,6 +21667,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"
@@ -20613,6 +21730,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)"
@@ -20781,21 +21910,50 @@ msgstr "Percorso generico"
msgid "Edit general route"
msgstr "Modifica percorso generico"
+msgctxt "route type"
+msgid "bicycle"
+msgstr "bicicletta"
+
+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"
@@ -20841,20 +21999,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"
@@ -20877,7 +22038,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)"
@@ -20973,18 +22134,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"
@@ -20992,10 +22162,13 @@ msgid "barrier"
msgstr "barriera"
msgid "motorroad"
-msgstr "riservata ai veicoli a motore"
+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"
@@ -21003,11 +22176,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"
@@ -21024,11 +22197,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)"
@@ -21039,29 +22215,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à"
@@ -21081,20 +22257,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"
@@ -21118,13 +22294,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"
@@ -21168,10 +22344,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"
@@ -21186,9 +22365,6 @@ msgstr "Insediamento urbano"
msgid "One Way"
msgstr "Senso unico"
-msgid "Church"
-msgstr "Chiesa"
-
msgid "Fuel Station"
msgstr "Stazione di rifornimento"
@@ -21216,6 +22392,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"
@@ -21232,7 +22411,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"
@@ -21241,7 +22420,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 +"
@@ -21261,11 +22440,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 "incline without highway"
-msgstr "incline senza highway"
+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 "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"
@@ -21276,8 +22485,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"
@@ -21289,13 +22498,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"
@@ -21411,20 +22620,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"
-msgstr "bridge senza highway/railway/waterway"
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr "bridge senza highway/railway/waterway/platform/piste/pipeline"
-msgid "psv without highway/railway/waterway"
-msgstr "psv senza highway/railway/waterway"
+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"
-msgstr "maxspeed senza highway/railway/traffic_sign"
+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 "recycling_type without amenity=recycling"
+msgstr "recycling_type senza amenity=recycling"
+
+msgid "board_type without information=board"
+msgstr "board_type senza information=board"
+
+msgid "shelter_type without amenity=shelter"
+msgstr "shelter_type senza amenity=shelter"
+
+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"
@@ -21444,8 +22764,58 @@ 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"
@@ -21456,20 +22826,29 @@ msgstr "Yahoo Sat"
msgid "Bing Sat"
msgstr "Bing Sat"
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr "HDDM (OpenStreetMap umanitario)"
+
msgid "MapBox Satellite"
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 e nero)"
-msgid "Skobbler"
-msgstr "Skobbler"
+msgid "skobbler"
+msgstr "skobbler"
+
+msgid "skobbler heatmap"
+msgstr "skobbler Heatmap"
msgid "skobbler heatmap"
msgstr ""
@@ -21487,17 +22866,20 @@ msgid "OpenStreetMap (German Style)"
msgstr "OpenStreetMap (stile tedesco)"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr ""
+msgstr "Cambogia, Laos, Thailandia, Vietnam bilingue"
-msgid "2u"
-msgstr "2u"
+msgid "osmfr"
+msgstr "osmfr"
msgid "AGRI black-and-white 2.5m"
-msgstr ""
+msgstr "AGRI bianco e nero 2.5m"
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr "basemap.at"
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -21505,7 +22887,7 @@ msgid "Tiris: DGM (Terrain model)"
msgstr "Tiris: DGM (modello terreno)"
msgid "Tiris: DOM (Surface model)"
-msgstr ""
+msgstr "Tiris: DOM (modello superficie)"
msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
@@ -21517,10 +22899,10 @@ msgid "Vienna: Orthofoto (aerial image)"
msgstr "Vienna: Ortofoto (immagini aeree)"
msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
-msgstr ""
+msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
msgid "VoGIS: Flächenwidmungsplan"
-msgstr ""
+msgstr "VoGIS: Flächenwidmungsplan"
msgid "VoGIS: DGM (Terrain model)"
msgstr "VoGIS: DGM (modello terreno)"
@@ -21541,10 +22923,10 @@ msgid "British Columbia Mosaic"
msgstr "Mosaico Columbia Britannica"
msgid "Czech CUZK:KM"
-msgstr ""
+msgstr "Ceco CUZK:KM"
msgid "Czech UHUL:ORTOFOTO"
-msgstr ""
+msgstr "Ceco UHUL:ORTOFOTO"
msgid "Fugro (Denmark)"
msgstr "Fugro (Danimarca)"
@@ -21565,28 +22947,28 @@ msgid "Estonia Multi (Maaamet)"
msgstr "Estonia Multi (Maaamet)"
msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgstr ""
+msgstr "CRAIG - Auvergne 2009/2010 - 30 cm"
msgid "CRAIG - Moulins 2009 - 15 cm"
-msgstr ""
+msgstr "CRAIG - Moulins 2009 - 15 cm"
msgid "CRAIG - Montluçon 2009 - 15 cm"
-msgstr ""
+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 ""
+msgstr "CRAIG - Le Puy 2010 - 15 cm"
msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
+msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgid "Géobretagne - Brest 2010 - 10 cm"
-msgstr ""
+msgstr "Géobretagne - Brest 2010 - 10 cm"
msgid "Géobretagne - Morbihan 2010"
-msgstr ""
+msgstr "Géobretagne - Morbihan 2010"
msgid "Géolittoral - Orthophotos 2000"
msgstr "Géolittoral - ortofoto 2000"
@@ -21601,10 +22983,10 @@ msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr "Loire-Atlantique - ortofoto 2012 - 20 cm"
msgid "Toulouse - Orthophotoplan 2011"
-msgstr ""
+msgstr "Tolosa - Orthophotoplan 2011"
msgid "Toulouse - Orthophotoplan 2007"
-msgstr ""
+msgstr "Tolosa - Orthophotoplan 2007"
msgid "Tours - Orthophotos 2008-2010"
msgstr "Tours - ortofoto 2008-2010"
@@ -21616,12 +22998,14 @@ 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 ""
+msgstr "Strade NRW Geofabrik.de"
msgid "Hike & Bike"
-msgstr ""
+msgstr "Hike & Bike"
msgid "OpenStreetMap (Sorbian Language)"
msgstr "OpenStreetMap (lingua soraba)"
@@ -21644,20 +23028,45 @@ 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 ""
+msgstr "Irlanda Britannica War Office Un pollice 1941-43 GSGS 4136"
msgid "Ireland Bartholomew Quarter-Inch 1940"
-msgstr ""
+msgstr "Irlanda Bartholomew Un quarto di pollice 1940"
msgid "Ireland EEA GMES Urban Atlas"
-msgstr ""
+msgstr "Irlanda EEA GMES Urban Atlas"
msgid "Ireland EEA CORINE 2006"
-msgstr ""
+msgstr "Irlanda EEA CORINE 2006"
msgid "Lodi - Italy"
msgstr "Lodi - Italia"
@@ -21687,10 +23096,10 @@ msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Lituania)"
msgid "Niger Delta Oct 2012 Landsat"
-msgstr ""
+msgstr "Niger Delta Ott 2012 Landsat"
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr ""
+msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
msgid "ScanEx IRS"
msgstr "ScanEx IRS"
@@ -21699,25 +23108,25 @@ msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
msgid "Freemap.sk Car"
-msgstr ""
+msgstr "Freemap.sk Car"
msgid "Freemap.sk Hiking"
-msgstr ""
+msgstr "Freemap.sk Hiking"
msgid "Freemap.sk Cyclo"
-msgstr ""
+msgstr "Freemap.sk Cyclo"
msgid "Freemap.sk Ski"
-msgstr ""
+msgstr "Freemap.sk Sci"
msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
+msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
+msgstr "Copy text \t Katastrálna mapa Slovenska (KaPor, 2011-05)"
msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
+msgstr "Slovacchia EEA GMES Urban Atlas"
msgid "Slovakia EEA CORINE 2006"
msgstr "Slovacchia EEA CORINE 2006"
@@ -21741,52 +23150,52 @@ msgid "GRAFCAN - Canary Islands"
msgstr "GRAFCAN - Isole Canarie"
msgid "ITACyL - Castile and León"
-msgstr ""
+msgstr "Copy text \t ITACyL - Castile and León"
msgid "IDEIB - Balearic Islands"
msgstr "IDEIB - Isole Balerari"
msgid "Kanton Aargau 25cm (AGIS 2011)"
-msgstr ""
+msgstr "Kanton Aargau 25cm (AGIS 2011)"
msgid "Stadt Uster Orthophoto 2008 10cm"
-msgstr ""
+msgstr "Stadt Uster Orthophoto 2008 10cm"
msgid "Stadtplan Zürich"
-msgstr ""
+msgstr "Stadtplan Zurigo"
msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
-msgstr ""
+msgstr "Kanton Solothurn 12.5cm (SOGIS 2007)"
msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
-msgstr ""
+msgstr "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
-msgstr ""
+msgstr "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgid "Canton de Génève 5cm (SITG 2011)"
msgstr "Cantone di Ginevra 5cm (SITG 2011)"
msgid "Canton de Neuchâtel 50cm (SITN 2006)"
-msgstr ""
+msgstr "Canton de Neuchâtel 50cm (SITN 2006)"
msgid "Canton du Jura 50cm (RCJU 1998)"
-msgstr ""
+msgstr "Canton du Jura 50cm (RCJU 1998)"
msgid "Canton de Fribourg 50cm (2005)"
msgstr "Cantone di Friburgo 50cm (2005)"
msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr ""
+msgstr "Stadt Bern 10cm/25cm (2008)"
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgstr ""
+msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
-msgstr ""
+msgstr "Ville de Nyon - Ortofoto 2010 HD 5cm/pi"
msgid "Cartoriviera - Orthophoto 2012"
-msgstr ""
+msgstr "Cartoriviera - Ortofoto 2012"
msgid "SIGIP - Orthophoto 2012"
msgstr "SIGIP - Ortofoto 2012"
@@ -21795,28 +23204,31 @@ msgid "Lausanne - Orthophoto technique 2012"
msgstr "Losanna - Ortofoto tecniche 2012"
msgid "MSR Maps Topo"
-msgstr ""
+msgstr "MSR Maps Topo"
msgid "MSR Maps Urban"
msgstr "MSR Mappe Urbane"
msgid "USGS Scanned Topographic Maps"
-msgstr ""
+msgstr "USGS Mappe topografiche scansionate"
msgid "USGS Large Scale Imagery"
-msgstr ""
+msgstr "USGS Immagini larga scala"
msgid "OSM US TIGER 2012 Roads Overlay"
-msgstr ""
+msgstr "Copy text \t OSM US TIGER 2012 Overlay strade"
+
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr "Strade TIGER nuove & disallineate (TIGER 2013)"
msgid "OSM - Tiger Edited Map"
-msgstr ""
+msgstr "OSM - Mappa Tiger modificata"
msgid "MassGIS L3 Parcels"
-msgstr ""
+msgstr "MassGIS L3 Parcelle"
msgid "NC 2010 Orthoimagery"
-msgstr ""
+msgstr "NC 2010 Orthoimagery"
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Ucraina - Ortofoto 2012"
@@ -21825,34 +23237,67 @@ msgid "7th Series (OS7)"
msgstr "7° serie (OS7)"
msgid "OS New Popular Edition historic"
-msgstr ""
+msgstr "OS Nuova edizione storica popolare"
msgid "OS OpenData StreetView"
msgstr "OS OpenData StreetView"
msgid "OS OpenData Locator"
-msgstr ""
+msgstr "OS OpenData Locator"
msgid "Surrey Air Survey"
-msgstr ""
+msgstr "Surrey Sorvolo aereo"
msgid "NLS - OS 6-inch Scotland 1842-82"
-msgstr ""
+msgstr "NLS - OS 6 pollici Scozia 1842-82"
msgid "NLS - OS 1:25k 1st Series 1937-61"
-msgstr ""
+msgstr "NLS - OS 1:25k 1° serie 1937-61"
msgid "NLS - OS 1-inch 7th Series 1955-61"
-msgstr ""
+msgstr "NLS - OS 1-inch 7° serie 1955-61"
msgid "OS 1:25k historic (OSM)"
-msgstr ""
+msgstr "Copy text \t OS 1:25k storica (OSM)"
msgid "OS Scottish Popular historic"
-msgstr ""
+msgstr "OS Scottish Popular historic"
msgid "NLS - Bartholomew Half Inch, 1897-1907"
-msgstr ""
+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 "delete data after import"
+msgstr "elimina i dati dopo l''importazione"
msgid "Columbus V-900 CSV Files"
msgstr "File CSV Columbus V-900"
@@ -21861,7 +23306,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"
@@ -21962,7 +23407,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}"
@@ -21991,7 +23436,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 ""
@@ -21999,7 +23444,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"
@@ -22069,6 +23514,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."
@@ -22090,14 +23547,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}''."
@@ -22372,10 +23823,13 @@ 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 "Housenumber increment:"
+msgid "House number increment:"
msgstr "Incremento numero civico:"
msgid "Updating properties of up to {0} object"
@@ -22395,7 +23849,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 "
@@ -22455,7 +23909,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}"
@@ -22589,8 +24043,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"
@@ -22921,7 +24375,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"
@@ -22975,15 +24429,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"
@@ -23019,7 +24464,7 @@ msgid "Buildings width:"
msgstr "Larghezza edifici:"
msgid "Length step:"
-msgstr "Passo di lunghezza:"
+msgstr "Lunghezza del passo:"
msgid "Advanced..."
msgstr "Avanzate..."
@@ -23179,6 +24624,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."
@@ -23199,12 +24647,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "alto"
-
-msgid "medium"
-msgstr "medio"
-
msgid "symbol"
msgstr "simbolo"
@@ -23247,8 +24689,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 ""
@@ -23359,6 +24801,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:"
@@ -23381,6 +24828,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?"
@@ -23468,7 +24918,7 @@ 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 "Load layer from cache"
@@ -23489,8 +24939,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."
@@ -23603,10 +25053,10 @@ msgid "Set {0} Lambert coordinates"
msgstr "Imposta {0} coordinate di Lambert"
msgid "Click second corner for image cropping"
-msgstr "Cliccare il secondo angolo per il ritaglio dell''immagine"
+msgstr "Clicca il secondo angolo per il ritaglio dell''immagine"
msgid "Click second Lambert crosspiece for georeferencing"
-msgstr "Cliccare la seconda traversa di Lambert per la georeferenziazione"
+msgstr "Clicca la seconda traversa di Lambert per la georeferenziazione"
msgid "Adjust WMS"
msgstr "Regola WMS"
@@ -23620,7 +25070,7 @@ 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"
@@ -23635,11 +25085,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}"
@@ -23689,7 +25142,7 @@ msgstr "Elimina lo schema selezionato nella lista."
msgid "Color Schemes"
msgstr "Schemi di colore"
-msgid "Adress"
+msgid "Address"
msgstr "Indirizzo"
msgid "Split area"
@@ -23732,7 +25185,7 @@ 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"
@@ -23919,27 +25372,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."
@@ -24488,8 +25923,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."
@@ -24708,7 +26143,7 @@ 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 regolazione IRS ed alcune altre cose al "
+"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."
@@ -24854,7 +26289,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"
@@ -25119,9 +26554,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"
@@ -25158,7 +26619,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: "
@@ -25305,8 +26766,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}"
@@ -25400,7 +26860,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 ""
@@ -25491,7 +26951,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"
@@ -25637,35 +27097,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 ""
@@ -25726,13 +27186,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}''."
@@ -25742,15 +27202,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 "
@@ -25770,8 +27230,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."
@@ -25786,7 +27246,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..."
@@ -25817,8 +27277,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}''"
@@ -25835,30 +27295,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}"
+msgstr "È stato generato un errore: {0}"
msgid "Process queue"
msgstr "Elabora coda"
@@ -25916,18 +27372,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"
@@ -25996,7 +27440,7 @@ 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"
@@ -26068,7 +27512,7 @@ msgid "Single segments"
msgstr "Segmenti singoli"
msgid "Orthogonal shapes"
-msgstr "Forme ortogonali"
+msgstr "Figure ortogonali"
msgid "Import settings"
msgstr "Importa le impostazioni"
@@ -26283,6 +27727,28 @@ msgstr "Test fallito: impossibile leggere mtime."
msgid "Test failed: Could not write mtime."
msgstr "Test fallito: impossibile scrivere mtime."
+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}?"
@@ -26438,9 +27904,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"
@@ -26568,7 +28039,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"
@@ -26586,7 +28057,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 "
@@ -26653,7 +28124,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"
@@ -26746,7 +28217,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 ..."
@@ -26763,9 +28234,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:"
@@ -26789,7 +28257,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"
@@ -26958,7 +28426,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''"
@@ -26990,21 +28458,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..."
@@ -27016,7 +28487,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"
@@ -27027,15 +28498,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:"
@@ -27058,13 +28549,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"
@@ -27112,13 +28603,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"
@@ -27153,9 +28644,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)"
@@ -27235,14 +28723,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 ""
@@ -27363,20 +28851,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"
@@ -27493,7 +28981,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"
@@ -27502,7 +28990,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"
@@ -27511,10 +28999,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"
@@ -27551,22 +29040,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"
@@ -27584,7 +29073,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"
@@ -27596,13 +29085,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"
@@ -27645,6 +29231,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..."
@@ -27813,9 +29404,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:"
@@ -27893,7 +29481,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>"
@@ -27914,13 +29502,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."
@@ -28041,8 +29629,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."
@@ -28236,8 +29824,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:"
@@ -28363,7 +29951,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''"
@@ -28539,7 +30127,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"
@@ -28662,7 +30250,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"
@@ -28757,8 +30345,8 @@ 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"
@@ -28870,8 +30458,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}"
@@ -28982,7 +30570,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"
@@ -28990,9 +30578,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"
@@ -29185,7 +30770,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 "
@@ -29211,7 +30796,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"
@@ -29285,7 +30870,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"
@@ -29302,18 +30887,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 a4d64ec..e3af4ea 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-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-08-26 01:50+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-08-27 04:31+0000\n"
-"X-Generator: Launchpad (build 16738)\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 "WARNING: {0}"
msgstr "警告: {0}"
@@ -81,7 +96,7 @@ msgid "Initializing validator"
msgstr "妥当性検査を初期化中"
msgid "Initializing map styles"
-msgstr "マップスタイルを初期化中"
+msgstr "地図スタイルを初期化中"
msgid "Loading imagery preferences"
msgstr "画像設定を読み込み中"
@@ -99,7 +114,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 "
@@ -165,18 +180,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 "
@@ -262,9 +275,6 @@ msgstr "ツール: {0}"
msgid "Please select at least four nodes."
msgstr "少なくとも４つのノードを選択してください。"
-msgid "Information"
-msgstr "情報"
-
msgid "Align Nodes in Line"
msgstr "ノードを一直線に配列"
@@ -301,6 +311,9 @@ msgstr "次"
msgid "Nothing selected to zoom to."
msgstr "ズームする対象が選択されていません。"
+msgid "Information"
+msgstr "情報"
+
msgid "Zoom to {0}"
msgstr "{0}へズーム"
@@ -355,9 +368,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}本のウェイを結合"
@@ -416,7 +429,7 @@ msgid "Toggle dialogs panel"
msgstr "ダイアログパネルの表示/非表示"
msgid "Toggle dialogs panel, maximize mapview"
-msgstr "ダイアログパネルの表示/非表示を切り替え、マップビューを最大化"
+msgstr "ダイアログパネルの表示/非表示を切り替え、地図ビューを最大化"
msgid "Distribute Nodes"
msgstr "ノードを等間隔に配置"
@@ -436,7 +449,7 @@ 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>"
+msgstr "<html>この操作には、{0}回の独立したダウンロードリクエストを<br>必要とします。続けますか？</html>"
msgid "Download data"
msgstr "データのダウンロード"
@@ -453,24 +466,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"
@@ -532,6 +544,9 @@ msgstr "履歴"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "OSMのウェイ、ノード、リレーションについての履歴情報を表示"
+msgid "Show history"
+msgstr "履歴を表示"
+
msgid "History (web)"
msgstr "履歴(web)"
@@ -607,7 +622,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 "これにより思わぬノードが削除されることがあります。"
@@ -646,9 +661,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 "タグの競合を修正"
@@ -676,7 +691,7 @@ msgid "Removed Element from Relations"
msgstr "リレーションから要素を削除"
msgid "Remove tags from inner ways"
-msgstr "内部のウェイからタグを削除"
+msgstr "内部ウェイからタグを削除"
msgid "Join Areas Function"
msgstr "エリア結合機能"
@@ -801,9 +816,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 "マージを中断"
@@ -880,7 +895,7 @@ msgid "New Layer"
msgstr "新規レイヤー"
msgid "Create a new map layer."
-msgstr "新しいマップレイヤーを作成"
+msgstr "新しい地図レイヤーを作成"
msgid "URL Files"
msgstr "URLファイル"
@@ -896,7 +911,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 "
@@ -904,7 +919,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 "インポーターがありません"
@@ -972,16 +987,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 "選択したノードの直交化を元に戻す"
@@ -990,15 +1005,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 "
@@ -1018,9 +1027,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>"
@@ -1036,10 +1042,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 "
@@ -1056,11 +1062,11 @@ 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 "設定..."
@@ -1187,9 +1193,6 @@ msgstr "セッションを読み込む"
msgid "Load a session from file."
msgstr "ファイルからセッションを読みます。"
-msgid "Session file (*.jos, *.joz)"
-msgstr "セッションファイル (*.jos,*.joz)"
-
msgid "Open session"
msgstr "セッションを開く"
@@ -1301,11 +1304,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 "
@@ -1324,16 +1327,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}個に分割"
@@ -1403,7 +1404,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"
@@ -1428,6 +1429,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 "取り消し"
@@ -1537,7 +1557,7 @@ msgid "Validating"
msgstr "検証中"
msgid "Test {0}/{1}: Starting {2}"
-msgstr "テスト {0}/{1}: {2} 開始"
+msgstr "{0}/{1}: {2}のテストを開始"
msgid "Updating ignored errors ..."
msgstr "無視されたエラーを更新中 ..."
@@ -1546,19 +1566,19 @@ 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 "拡大"
@@ -1667,7 +1687,7 @@ msgid "Download Compressed OSM Change"
msgstr "OSMの変更を圧縮形式でダウンロード"
msgid "Download OSM Change"
-msgstr "ODMの変更をダウンロード"
+msgstr "OSMの変更をダウンロード"
msgid "Download Compressed OSM"
msgstr "OSMを圧縮形式でダウンロード"
@@ -1699,7 +1719,7 @@ msgstr "OSMのURLをダウンロード"
msgid "There was {0} conflict during import."
msgid_plural "There were {0} conflicts during import."
-msgstr[0] "インポート中に {0} の競合がありました。"
+msgstr[0] "インポート中に{0}件の競合がありました。"
msgid "Conflict during download"
msgid_plural "Conflicts during download"
@@ -1714,6 +1734,9 @@ 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})"
@@ -1743,7 +1766,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 ""
@@ -1823,7 +1846,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 "新規ウェイを最後に操作したノードから開始"
@@ -1934,8 +1957,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"
@@ -2045,17 +2068,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 "メンバーをダウンロード"
@@ -2202,7 +2225,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'' をキー名に含む"
@@ -2382,6 +2405,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 "演算子"
@@ -2548,16 +2574,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 "Range of primitive ids expected"
-msgstr "利用可能なプリミティブIDの範囲"
+msgstr "プリミティブIDの範囲の指定が必要です"
msgid "Range of changeset ids expected"
-msgstr "利用可能な変更セットIDの範囲"
+msgstr "変更セットIDの範囲の指定が必要です"
msgid "Range of versions expected"
-msgstr "利用可能なバージョンの範囲"
+msgstr "バージョンの範囲の指定が必要です"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr "タグオペレーターを使っている時は、キーは空ではいけません。例えば、こうしてください: key=value"
@@ -2566,13 +2592,13 @@ msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr "プリミティブの種類が不明です: {0}. 許される値は、\"node\", \"way\" そして \"relation\"です。"
msgid "Primitive id expected"
-msgstr "プリミティブIDを期待"
+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}"
@@ -2586,9 +2612,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 "
@@ -2599,7 +2624,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機能違反"
@@ -2674,7 +2699,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} を変更"
@@ -2710,13 +2738,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}\" で置き換える。"
@@ -2739,9 +2767,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 "レイヤー ''{0}'' が既に存在しません。オブジェクト ''{1}'' の競合を削除できません。"
msgid "Add conflict for ''{0}''"
msgstr "''{0}'' に競合を追加"
@@ -2770,19 +2798,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}''を削除"
@@ -2814,42 +2842,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}"
@@ -2865,7 +2896,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} のバージョンの競合を解決"
@@ -2901,9 +2932,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 "リレーション"
@@ -2932,14 +2963,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 "自動タグ修正"
@@ -2956,6 +2987,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}"
@@ -2963,10 +2997,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 "質問"
@@ -2988,19 +3022,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 "
@@ -3008,23 +3042,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 "
@@ -3039,9 +3071,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}"
@@ -3070,12 +3102,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}'' には既に競合が登録されています"
@@ -3115,10 +3146,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 "
@@ -3137,8 +3168,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} のウェイの結合対象が見つかりません"
@@ -3226,44 +3257,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 "リレーション: 選択済み"
@@ -3305,10 +3335,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}''）"
@@ -3334,12 +3364,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}'' が解釈できません"
@@ -3351,7 +3381,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 "Unknown parameter ''{0}''"
msgstr "''{0}'' は不明なパラメーターです"
@@ -3372,9 +3405,6 @@ msgstr "独自の投影法"
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr "エラー: リソース ''/data/{0}'' の入力ストリームをオープンできませんでした。"
-
msgid "WGS84"
msgstr "WGS84"
@@ -3404,16 +3434,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 "住所"
@@ -3428,7 +3461,7 @@ msgid "House number without street"
msgstr "通り名のない住居番号がある"
msgid "House number ''{0}'' duplicated"
-msgstr "家屋番号 ''{0}'' が重複しています"
+msgstr "住居番号''{0}''が重複しています"
msgid "Duplicate house numbers"
msgstr "住居番号が重複している"
@@ -3439,6 +3472,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 "建物の内側にある建物"
@@ -3498,6 +3540,9 @@ msgstr " あるいは "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0}は推奨されていません。かわりに{1}を使用してください"
+msgid "{0} is unnecessary"
+msgstr "{0}は不要です"
+
msgid "Duplicated nodes"
msgstr "重複したノード"
@@ -3557,7 +3602,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 "同じ位置を持つウェイ"
@@ -3580,6 +3625,15 @@ 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 "マルチポリゴン"
@@ -3599,7 +3653,7 @@ msgid "No style in multipolygon relation"
msgstr "マルチポリゴンのリレーションにスタイルがありません"
msgid "Style for inner way equals multipolygon"
-msgstr "インナーウェイのスタイルはマルチポリゴンと同じです"
+msgstr "内部ウェイのスタイルがマルチポリゴンと同じです"
msgid "Style for outer way mismatches"
msgstr "アウターウェイのスタイルがアンマッチです"
@@ -3608,7 +3662,7 @@ msgid "Multipolygon is not closed"
msgstr "マルチポリゴンが閉じられていません"
msgid "Multipolygon inner way is outside"
-msgstr "マルチポリゴンのインナーウェイが外側です"
+msgstr "マルチポリゴンの内部ウェイが外側にあります"
msgid "Intersection between multipolygon ways"
msgstr "マルチポリゴンウェイ間の交差"
@@ -3651,6 +3705,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 "エリアの重複"
@@ -3666,7 +3726,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 "一部を共有しているエリア"
@@ -3708,15 +3768,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}）が少なすぎます"
@@ -3737,7 +3797,7 @@ msgstr "自身で交差するウェイ"
msgid ""
"This test checks for ways that contain some of their nodes more than once."
-msgstr "この検査は、同じノードを複数回使用するウェイをチェックします。"
+msgstr "このテストは、同じノードを複数回使用するウェイをチェックします。"
msgid "Similarly named ways"
msgstr "同じような名前のウェイ"
@@ -3746,17 +3806,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"
@@ -3769,7 +3829,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より小さいコードのキャラクタが含まれています"
@@ -3787,10 +3847,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 "値で、空白文字を最初か最後にあるプロパティ"
@@ -3888,23 +3948,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 "進行方向制限"
@@ -3961,7 +4021,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}"
@@ -3993,14 +4056,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 "他の道路の近くにあるウェイの終端ノード"
@@ -4020,12 +4080,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''を含むタグがあります"
@@ -4086,23 +4146,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 "次回から表示しない"
@@ -4135,11 +4178,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 "公共交通"
@@ -4166,7 +4209,7 @@ msgid "Internal Server Error"
msgstr "サーバーの内部エラー"
msgid "Bad Request"
-msgstr "不正な要求"
+msgstr "不正なリクエスト"
msgid "Not Found"
msgstr "見つかりません"
@@ -4204,8 +4247,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 "今日のメッセージはありません"
@@ -4288,7 +4331,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を付加）"
@@ -4297,7 +4340,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データをダウンロード"
@@ -4353,10 +4396,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 "更新されたプラグインをインストール中"
@@ -4365,13 +4408,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データ"
@@ -4384,7 +4427,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?"
@@ -4435,6 +4478,18 @@ 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 "音声"
@@ -4457,7 +4512,7 @@ msgid "Move right"
msgstr "右へ移動"
msgid "Map: {0}"
-msgstr "マップ: {0}"
+msgstr "地図: {0}"
msgid "Move left"
msgstr "左へ移動"
@@ -4539,19 +4594,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)"
@@ -4572,26 +4614,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 "オブジェクトを削除"
@@ -4845,29 +4887,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"
@@ -4882,14 +4942,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 "削除"
@@ -4921,23 +4981,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 "ノード"
@@ -5071,7 +5123,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/>継続しますか？"
@@ -5090,7 +5142,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"
@@ -5143,15 +5195,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}"
@@ -5189,15 +5241,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 "
@@ -5325,11 +5377,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 "クリックしてこのダイアログを閉じ、編集を続ける"
@@ -5500,13 +5552,13 @@ msgid "Way: "
msgstr "ウェイ: "
msgid "Relation: "
-msgstr "リレーション： "
+msgstr "リレーション: "
msgid "deleted-on-server"
msgstr "サーバー上で削除"
msgid "modified"
-msgstr "変更されました"
+msgstr "変更あり"
msgid "filtered/hidden"
msgstr "フィルター/非表示"
@@ -5546,7 +5598,7 @@ msgstr "タグ: "
msgid "{0} Member: "
msgid_plural "{0} Members: "
-msgstr[0] "{0} メンバー: "
+msgstr[0] "{0}件のメンバー: "
msgid " as \"{0}\""
msgstr " ロール \"{0}\""
@@ -5692,13 +5744,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 "レイヤー表示/非表示"
@@ -5713,7 +5765,7 @@ msgid "Activate"
msgstr "有効化"
msgid "Activate the selected layer"
-msgstr "選択されたレイヤーを有効化"
+msgstr "選択されたレイヤーを有効化します"
msgid "Activate layer"
msgstr "アクティブレイヤー"
@@ -5743,7 +5795,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 "選択したレイヤーを一つ下に移動します。"
@@ -5754,6 +5806,9 @@ msgstr "表示/非表示"
msgid "Information about layer"
msgstr "レイヤーについての情報"
+msgid "Map paint preferences"
+msgstr "地図描画設定"
+
msgid "Map Paint Styles"
msgstr "地図描画スタイル"
@@ -5810,7 +5865,7 @@ msgid "Map Style info"
msgstr "マップスタイル情報"
msgid "Source"
-msgstr "情報ソース"
+msgstr "ソース"
msgid "Title:"
msgstr "タイトル:"
@@ -5836,6 +5891,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 "リレーション"
@@ -5910,14 +5997,14 @@ 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 "このユーザーが登録したオブジェクトを選択"
@@ -5925,9 +6012,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 "
@@ -5980,7 +6066,7 @@ msgid "Fixing errors ..."
msgstr "エラー修正中 ..."
msgid "Fixing ({0}/{1}): ''{2}''"
-msgstr "({0}/{1}) 修正中: ''{2}''"
+msgstr "''{2}''を修正中（{0}/{1}）"
msgid "Updating map ..."
msgstr "地図を更新中 ..."
@@ -6098,9 +6184,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 "選択されたオブジェクトの履歴をダウンロードして表示"
@@ -6223,7 +6306,7 @@ msgid ""
msgstr "変更セットの作成もしくは保存日時によって選択"
msgid "Select only changesets related to a specific bounding box"
-msgstr "指定した境界囲みに関連する変更セットだけを選択"
+msgstr "指定した矩形範囲に関連する変更セットのみを選択"
msgid "Query open changesets only"
msgstr "開いている変更セットだけを問い合わせる"
@@ -6269,13 +6352,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 "日付: "
@@ -6314,15 +6397,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"
@@ -6392,12 +6475,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 "基本"
@@ -6456,37 +6539,49 @@ msgid ""
msgstr "変更セットクエリは現状では常に ''{0}'' に投稿されます。以下のURLに含まれるホスト、ポート、パスは無視されます。"
msgid "This changeset query URL is invalid"
-msgstr "不正な変更セットクエリURLです"
+msgstr "この変更セットクエリURLは不正です"
+
+msgid "Discardable key: selection Foreground"
+msgstr "削除可能なキー: 選択の前景色"
-msgid "Select objects for which to change properties."
-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 "タグ: {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 "リレーションの変更"
@@ -6500,17 +6595,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ヘルプのためにブラウザーを起動"
@@ -6559,7 +6654,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 "空の値でタグを削除します。"
@@ -6579,7 +6674,7 @@ 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 "デフォルトではタグに英語を使用してください"
@@ -6589,7 +6684,7 @@ 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 "キーを選択してください"
@@ -6657,20 +6752,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 "リレーションをダウンロード"
@@ -6761,7 +6856,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 "選択中のリレーションメンバーのオブジェクトを選択"
@@ -6892,7 +6987,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 "これはオブジェクトからロールを削除することと同じことです。"
@@ -6983,6 +7078,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 "ブックマーク"
@@ -7037,16 +7151,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]の範囲で必須です。"
+msgstr "経度の値は[-180,180]の範囲でなければなりません。"
msgid "Data Sources and Types:"
msgstr "データのソースと種別:"
@@ -7055,22 +7169,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 "起動時にこのダイアログを開く"
@@ -7085,25 +7200,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 "
@@ -7119,21 +7234,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, "
@@ -7143,28 +7245,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 "クラス種別"
@@ -7273,8 +7356,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が空です。"
@@ -7372,6 +7455,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 "変更セット情報"
@@ -7474,8 +7560,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 "アップロード"
@@ -7495,6 +7581,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:"
@@ -7561,9 +7653,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用の認証を入力"
@@ -7637,11 +7728,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 "
@@ -7655,9 +7745,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 "オブジェクトをダウンロード"
@@ -7722,7 +7811,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 "保存されていないデータと競合"
@@ -7751,9 +7840,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 "書き込み不可なファイルのためデータは保存されませんでした"
@@ -7874,12 +7962,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 "
@@ -7887,10 +7969,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 "前のダイアログに戻ってもっと内容が分かりやすいコメントを入力する"
@@ -7907,6 +8008,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 "アップロードをキャンセルして編集に戻る"
@@ -7914,9 +8029,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 "アップロードのためにオブジェクトを準備中..."
@@ -7944,7 +8059,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 "
@@ -7953,14 +8068,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"
@@ -7971,15 +8086,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}''"
@@ -8013,7 +8128,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 "
@@ -8040,17 +8155,17 @@ 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>"
@@ -8068,14 +8183,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 "オブジェクトをいくつかの塊にして、データをアップロードします。チャンクサイズ： "
@@ -8088,7 +8203,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つの変更セットにまとめて、アップロード画面に戻る。"
@@ -8097,24 +8212,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より大きい整数を入力してください"
@@ -8139,15 +8254,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 "配色のカスタマイズ"
@@ -8162,11 +8277,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 "説明"
@@ -8182,18 +8297,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ファイルの保存"
@@ -8210,7 +8325,7 @@ msgstr "次のマーカー"
msgid "Jump to next marker"
msgstr "次のマーカーにジャンプ"
-msgid "Previos marker"
+msgid "Previous marker"
msgstr "前のマーカー"
msgid "Jump to previous marker"
@@ -8243,12 +8358,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} の構成は次の通りです。"
@@ -8383,14 +8498,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 "解像度の変更"
@@ -8417,7 +8532,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ファイルを保存"
@@ -8523,7 +8638,7 @@ msgid "Correlate"
msgstr "関連付け"
msgid "Invalid timezone"
-msgstr "不正なタイムゾーン"
+msgstr "タイムゾーンが無効です"
msgid "Invalid offset"
msgstr "不正なオフセット"
@@ -8540,7 +8655,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}"
@@ -8553,7 +8668,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 "
@@ -8606,20 +8721,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"
@@ -8627,16 +8739,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 "ディスクから画像ファイルを削除"
@@ -8682,6 +8797,12 @@ msgstr "次へ"
msgid "Show next Image"
msgstr "次の画像を表示"
+msgid "Show first Image"
+msgstr "最初の画像を表示"
+
+msgid "Show last Image"
+msgstr "最後の画像を表示"
+
msgid "Center view"
msgstr "中央表示"
@@ -8696,14 +8817,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"
@@ -8762,9 +8883,6 @@ msgstr ""
"<html>処理していない GPS "
"データを地図データとしてアップロードする行為は有害なことです。<br>トレースデータをアップする場合は、次の場所から行ってください。</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr "トラック描画をカスタマイズ"
@@ -8896,7 +9014,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 "このレイヤーには、開始オフセットを指すオーディオマーカーがありません。"
@@ -8947,15 +9065,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}'' を読み込み中..."
@@ -8968,8 +9082,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 "不正なマイナス符号、値は正でないといけません。"
@@ -8978,24 +9092,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 "デフォルト設定を使用"
@@ -9004,7 +9118,7 @@ msgid "Consumer Key:"
msgstr "コンシューマキー:"
msgid "Consumer Secret:"
-msgstr "秘密の消費者コード"
+msgstr "コンシューマー秘密鍵:"
msgid "Request Token URL:"
msgstr "リクエストトークンURL:"
@@ -9044,8 +9158,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 "
@@ -9054,14 +9168,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 "
@@ -9091,15 +9205,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 "今すぐ認証"
@@ -9136,8 +9250,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認証に失敗しました"
@@ -9148,21 +9262,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 "アクセストークン"
@@ -9171,31 +9285,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 "クリックしてアクセストークンをテスト"
@@ -9217,16 +9331,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}'' の応答としてセッションクッキーが返ってきませんでした"
@@ -9239,7 +9353,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ウェブサイトのセッションを初期化中..."
@@ -9248,7 +9362,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}'' をログアウト中..."
@@ -9292,37 +9406,37 @@ 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 "アクセストークンをリクエスト"
@@ -9336,41 +9450,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>"
+"<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 "
@@ -9416,16 +9530,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 "
@@ -9532,12 +9644,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 "検索:"
@@ -9909,7 +10021,7 @@ msgid "Load profile"
msgstr "プロファイルを開く"
msgid "Save {0} profile"
-msgstr "{0}件のプロファイルを保存"
+msgstr "{0}のプロファイルを保存"
msgid "All the preferences of this group are default, nothing to save"
msgstr "このグループに関する設定項目はすべてデフォルトですので、保存する必要はありません"
@@ -9959,8 +10071,8 @@ msgstr "設定を追加"
msgid "Advanced Background: Changed"
msgstr "高度な設定の背景色: 変更済み"
-msgid "Advanced Background: NonDefalut"
-msgstr "高度な設定の背景色: 非デフォルト"
+msgid "Advanced Background: NonDefault"
+msgstr "高度な設定の背景色: 初期値ではない"
msgid "Current value is default."
msgstr "現在の値は既定値です。"
@@ -10027,6 +10139,9 @@ msgstr "選択モードで仮想ノードを表示する"
msgid "Draw inactive layers in other color"
msgstr "アクティブなレイヤー以外は別の色で表示する"
+msgid "Display discardable keys"
+msgstr "削除されるキーを表示"
+
msgid "Highlight target ways and nodes"
msgstr "選択中のウェイやノードを強調表示"
@@ -10080,6 +10195,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 "描画パフォーマンス関連オプション"
@@ -10544,6 +10664,12 @@ msgstr ""
"<i>(JOSMはデータレイヤーを保存する際にバックアップファイルを保持できます。 "
"ファイル名の最後に''~''を付加して同じフォルダに保存します。)</i>"
+msgid "Notification at each save"
+msgstr "保存するごとに通知"
+
+msgid "When saving, display a small notification"
+msgstr "保存するとき、小さい通知を表示します"
+
msgid "File backup"
msgstr "ファイルバックアップ"
@@ -10608,8 +10734,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"
@@ -10709,7 +10835,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})"
@@ -10877,21 +11003,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"
@@ -10913,6 +11024,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}'' をテスト中"
@@ -10971,9 +11097,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 ユーザー名:"
@@ -10981,30 +11107,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 "Failed to retrieve OAuth Access Token from credential manager"
+msgstr "認証マネージャーからOAuthアクセストークンの取得に失敗しました"
-msgid "Warning: Failed to store OAuth Access Token to credentials 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 "プリファレンスに保存"
@@ -11018,10 +11149,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>"
@@ -11078,15 +11209,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 "ショートカット: ユーザーの背景色"
@@ -11120,7 +11247,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 "タグテーブルの選択を削除"
@@ -11142,7 +11269,7 @@ msgstr "タイプ{0}の要素がサポートされます"
msgid "Change {0} object"
msgid_plural "Change {0} objects"
-msgstr[0] "{0}個のオブジェクトを変更"
+msgstr[0] "{0}件のオブジェクトを変更"
msgid "Nothing selected!"
msgstr "何も選択されていません！"
@@ -11156,8 +11283,8 @@ msgstr "プリセットの適用"
msgid "New relation"
msgstr "新しいリレーション"
-msgid "Change Properties"
-msgstr "プロパティの変更"
+msgid "Change Tags"
+msgstr "タグの変更"
msgid "Unknown requisite: {0}"
msgstr "不明な必要条件: {0}"
@@ -11243,9 +11370,6 @@ msgstr "親の無いロール要素をプリセット"
msgid "Preset sub element without parent"
msgstr "親の無いサブ要素をプリセット"
-msgid "Could not read tagging preset source: {0}"
-msgstr "タグ付けプリセットのソース {0} を読み込めません。"
-
msgid "Error parsing {0}: "
msgstr "走査時にエラー: {0}: "
@@ -11264,6 +11388,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 "すべてのファイル (*.*)"
@@ -11282,7 +11414,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 "
@@ -11293,9 +11425,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}'' の存在しないノードを含んでいます。"
@@ -11326,9 +11498,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}'' が解析できません"
@@ -11366,31 +11538,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 "サーバーからの応答をパース中..."
@@ -11486,6 +11656,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}。"
@@ -11501,15 +11674,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}に変更できませんでした。"
@@ -11547,7 +11725,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 "
@@ -11587,8 +11765,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のインポートに失敗しました。"
@@ -11621,7 +11799,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 "変更セットを更新中..."
@@ -11636,7 +11814,7 @@ msgid "No changeset present for diff upload."
msgstr "diffアップロードのための変更セットを用意できませんでした。"
msgid "Preparing upload request..."
-msgstr "アップロード要求を準備中..."
+msgstr "アップロードリクエストを準備中..."
msgid "Waiting 10 seconds ... "
msgstr "10秒待機中 ... "
@@ -11686,37 +11864,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 "
@@ -11726,9 +11880,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 "変更セットコンテンツをパース中 ..."
@@ -11754,11 +11908,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>"
@@ -11844,9 +11995,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}"
@@ -11887,23 +12038,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} をダウンロード中 ..."
@@ -11922,7 +12073,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 "エラーテキストの読み出しに失敗。"
@@ -11962,7 +12113,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 "データアップロード中 ..."
@@ -11988,7 +12139,10 @@ msgid "Save user and password (unencrypted)"
msgstr "ユーザーとパスワードを保存します(暗号化されません)"
msgid "<delete from {0} objects>"
-msgstr "<{0}個のオブジェクトから削除>"
+msgstr "<{0}件のオブジェクトから削除>"
+
+msgid "Old values of"
+msgstr "以前の値:"
msgid "Old values of"
msgstr "以前の値:"
@@ -12044,8 +12198,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 "RemoteControl::Accepting connections on port {0}"
msgstr "リモートコントロール::ポート{0}で接続を受け付けています"
@@ -12075,7 +12235,8 @@ msgid ""
"Remote Control has been asked to report its supported features. This enables "
"web sites to guess a running JOSM version"
msgstr ""
-"リモート制御により、サポートしている機能を報告するよう要求されました。これにより、動作中のJOSMのバージョンをウェブサイトから推測することができます。"
+"リモート制御により、サポートしている機能を報告するようリクエストされました。これにより、動作中のJOSMのバージョンをウェブサイトから推測することができま"
+"す。"
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
@@ -12091,6 +12252,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."
@@ -12121,20 +12291,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: "
@@ -12155,11 +12325,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}'' ファイルが見つかりません。"
@@ -12229,15 +12411,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}''の作成に失敗しました。"
@@ -12260,7 +12442,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 "
@@ -12317,7 +12499,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 "
@@ -12350,7 +12532,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."
@@ -12380,11 +12562,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 "このプラグインを使用不可にする"
@@ -12398,25 +12580,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}'' を無効化"
@@ -12484,9 +12664,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 "プラグインのサイトキャッシュアイコンファイルを処理中..."
@@ -12500,11 +12679,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}'' にプラグインリストを書き込み中"
@@ -12601,8 +12794,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 "
@@ -12613,8 +12806,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 "
@@ -12625,8 +12818,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 "
@@ -12637,8 +12830,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 "
@@ -12649,8 +12842,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 "
@@ -12661,8 +12854,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 "
@@ -12673,8 +12866,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 "
@@ -12685,8 +12878,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 "
@@ -12697,8 +12890,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 "
@@ -12721,8 +12914,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 "
@@ -12738,8 +12931,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 "
@@ -12824,8 +13017,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}"
@@ -12870,13 +13063,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 "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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
+msgstr "セキュリティのため''{0}''ディレクトリへのアクセスに失敗しました。例外: {1}"
msgid "{0}... [please type its number]"
msgstr "{0}... [番号を入力してください]"
@@ -12886,9 +13078,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}'' に変更されました。"
@@ -12921,8 +13156,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 "
@@ -12993,7 +13241,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 "データベースはメンテナンスのためにオフラインになっています。"
@@ -13004,7 +13252,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ログイン"
@@ -13251,6 +13500,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 "単一のダイアログでグループの共通の住所を補完入力します。オプションで自動的にウェイから独立した住居番号を作成します。"
@@ -13331,7 +13585,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 ""
"Talk with users editing the map nearby, be notified when someone comes close."
@@ -13494,7 +13752,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形式でインポート"
@@ -13507,6 +13765,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."
@@ -13560,9 +13821,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の編集機能"
@@ -13602,6 +13860,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データに電子署名をするプラグイン"
@@ -13664,7 +13927,7 @@ msgid "Edit Motorway"
msgstr "自動車専用道路の編集"
msgid "Reference"
-msgstr "道路番号"
+msgstr "参照番号"
msgid "Lanes"
msgstr "車線数"
@@ -13691,7 +13954,7 @@ msgid "metal"
msgstr "金属"
msgid "wood"
-msgstr "木"
+msgstr "木材"
msgid "paving_stones"
msgstr "石畳"
@@ -13738,6 +14001,9 @@ msgstr "土手"
msgid "Lit"
msgstr "照明"
+msgid "Toll"
+msgstr "料金"
+
msgid "Motorway Link"
msgstr "自動車専用道路の連絡路"
@@ -13828,6 +14094,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 "生活道路"
@@ -13846,11 +14156,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 "裏通り・路地"
@@ -13861,6 +14171,9 @@ msgstr "進入路"
msgid "parking_aisle"
msgstr "駐車場の通路"
+msgid "drive-through"
+msgstr "ドライブスルー"
+
msgid "Parking Aisle"
msgstr "駐車場の通路"
@@ -13888,18 +14201,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)"
@@ -13909,9 +14216,6 @@ msgstr "通行制限"
msgid "General Access"
msgstr "一般通行"
-msgid "destination"
-msgstr "目的地"
-
msgid "delivery"
msgstr "配達目的"
@@ -13921,15 +14225,15 @@ msgstr "許可が必要"
msgid "private"
msgstr "私用"
+msgid "customers"
+msgstr "来客用"
+
msgid "agricultural"
msgstr "農業用"
msgid "forestry"
msgstr "林業用途"
-msgid "no"
-msgstr "いいえ"
-
msgid "official"
msgstr "公務"
@@ -13975,6 +14279,9 @@ msgstr "大型トラック (hov)"
msgid "Public Service Vehicles (psv)"
msgstr "公共交通機関(psv)"
+msgid "Tourist buses"
+msgstr "観光バス"
+
msgid "Min. speed (km/h)"
msgstr "最低速度（km/h)"
@@ -14045,7 +14352,7 @@ msgid "living_street"
msgstr "生活道路"
msgid "service"
-msgstr "サービス"
+msgstr "敷地内道路"
msgid "bus_guideway"
msgstr "バスガイドウェイ"
@@ -14059,6 +14366,9 @@ msgstr "橋の編集"
msgid "viaduct"
msgstr "高架橋"
+msgid "suspension"
+msgstr "つり橋"
+
msgid "swing"
msgstr "旋回橋"
@@ -14163,20 +14473,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 "車いす"
@@ -14193,11 +14512,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 "自転車用道路"
@@ -14232,8 +14551,8 @@ msgstr "右側の自転車レーン"
msgid "Oneway (bicycle)"
msgstr "一方通行(自転車)"
-msgid "Edit Highway"
-msgstr "道路を編集"
+msgid "Edit Highway Attributes:"
+msgstr "道路属性の編集:"
msgid "Highway"
msgstr "道路"
@@ -14278,7 +14597,7 @@ msgid "Edit Motorway Junction"
msgstr "自動車道のIC/JCTの編集"
msgid "Number"
-msgstr "数"
+msgstr "番号"
msgid "Exit to"
msgstr "出口方面"
@@ -14301,12 +14620,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 "横断歩道タイプ"
@@ -14322,15 +14647,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)"
@@ -14352,6 +14668,15 @@ msgstr "ペガサス柄横断歩道（ＵＫ）"
msgid "tiger"
msgstr "虎縞柄横断歩道（ＵＫ）"
+msgid "Crossing attendant"
+msgstr "有人"
+
+msgid "Cross by bicycle"
+msgstr "自転車用横断歩道"
+
+msgid "Cross on horseback"
+msgstr "馬用横断道"
+
msgid "Stop"
msgstr "停止"
@@ -14361,6 +14686,9 @@ msgstr "徐行"
msgid "Mini-roundabout"
msgstr "小さなロータリー"
+msgid "Edit Mini-Roundabout"
+msgstr "小さなロータリーを編集"
+
msgid "Direction"
msgstr "方向"
@@ -14370,12 +14698,9 @@ msgstr "時計回り"
msgid "Pedestrian Crossing"
msgstr "横断歩道"
-msgid "Edit Crossing"
+msgid "Edit Pedestrian Crossing"
msgstr "横断歩道の編集"
-msgid "Type name (UK)"
-msgstr "タイプ名(UK)"
-
msgid "Traffic Calming"
msgstr "交通静穏化"
@@ -14406,17 +14731,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 "二つ目の名前"
@@ -14440,7 +14762,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 "Block"
msgstr "ブロック"
@@ -14466,6 +14803,9 @@ msgstr "ライジングボラード"
msgid "removable"
msgstr "削除可能"
+msgid "plastic"
+msgstr "プラスチック"
+
msgid "Cycle Barrier"
msgstr "自転車止め"
@@ -14535,20 +14875,17 @@ msgstr "金網"
msgid "electric"
msgstr "電気"
-msgid "roundpole"
-msgstr "丸木柵"
-
-msgid "split_rail"
-msgstr "柵"
+msgid "pole"
+msgstr "柱"
-msgid "chain"
-msgstr "金網"
+msgid "Guard Rail"
+msgstr "ガードレール"
-msgid "hedge"
-msgstr "生垣"
+msgid "Edit Guard Rail"
+msgstr "ガードレール"
-msgid "pole"
-msgstr "柱"
+msgid "wire"
+msgstr "ワイヤー"
msgid "Guard Rail"
msgstr "ガードレール"
@@ -14578,6 +14915,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr "堀"
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr "排水路の編集"
@@ -14587,11 +14925,11 @@ msgstr "縁石"
msgid "Edit Kerb"
msgstr "縁石の編集"
-msgid "Entrance"
-msgstr "入口"
+msgid "Entrance (barrier opening)"
+msgstr "入口（柵の開口部）"
-msgid "Edit Entrance"
-msgstr "入口の編集"
+msgid "Edit Entrance (barrier opening)"
+msgstr "入口（柵の開口部）の編集"
msgid "Gate"
msgstr "ゲート"
@@ -14644,12 +14982,6 @@ msgstr "隙間"
msgid "stepover"
msgstr "階段"
-msgid "Material"
-msgstr "素材"
-
-msgid "stone"
-msgstr "石"
-
msgid "Turnstile"
msgstr "回転式木戸"
@@ -14710,12 +15042,21 @@ msgstr "放水路の編集"
msgid "Ditch"
msgstr "排水路"
+msgid "Edit Ditch"
+msgstr "排水路の編集"
+
msgid "Stream"
msgstr "小川"
msgid "Edit Stream"
msgstr "小川の編集"
+msgid "Wadi"
+msgstr "涸れ川"
+
+msgid "Edit Wadi"
+msgstr "涸れ川の編集"
+
msgid "Canal"
msgstr "運河"
@@ -14755,9 +15096,6 @@ msgstr "ダムの編集"
msgid "Groyne"
msgstr "防砂堤"
-msgid "Edit Groyne"
-msgstr "防砂堤を編集"
-
msgid "Breakwater"
msgstr "防波堤"
@@ -14791,6 +15129,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 "陸地"
@@ -14870,22 +15223,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 "フェリー航路"
@@ -14959,17 +15317,17 @@ msgstr "観光"
msgid "freight"
msgstr "貨物"
-msgid "Service/Type"
+msgid "Service type"
msgstr "線路の種別"
msgid "yard"
msgstr "ヤード"
msgid "siding"
-msgstr "待避線"
+msgstr "側線"
msgid "spur"
-msgstr "分岐線"
+msgstr "引き込み線"
msgid "Gauge (mm)"
msgstr "軌間(mm)"
@@ -14983,11 +15341,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"
@@ -14998,9 +15359,6 @@ msgstr "トロッコ線路（狭軌）"
msgid "Edit Narrow Gauge Rail"
msgstr "トロッコ線路（狭軌）の編集"
-msgid "Types"
-msgstr "タイプ"
-
msgid "Monorail"
msgstr "モノレール"
@@ -15052,6 +15410,9 @@ msgstr "廃線を編集"
msgid "Level Crossing"
msgstr "踏切"
+msgid "Edit Level Crossing"
+msgstr "踏切の編集"
+
msgid "Supervised"
msgstr "監視員の有無"
@@ -15064,18 +15425,32 @@ 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 "半幅2本"
+msgstr "半幅二本"
msgid "Crossing"
msgstr "歩行者用踏切"
+msgid "Edit Crossing"
+msgstr "歩道用踏切の編集"
+
msgid "Crossing type"
msgstr "踏切のタイプ"
@@ -15175,13 +15550,11 @@ msgstr "マジックカーペット"
msgid "Edit Magic Carpet"
msgstr "マジックカーペットの編集"
-msgctxt "aerialway"
msgid "Goods"
-msgstr "貨物索道"
+msgstr "貨物用索道"
-msgctxt "aerialway"
msgid "Edit Goods"
-msgstr "貨物索道の編集"
+msgstr "貨物用索道の編集"
msgctxt "aerialway"
msgid "Station"
@@ -15191,13 +15564,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "駅の編集"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "支柱"
+msgstr "索道用支柱"
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "支柱の編集"
+msgstr "索道用支柱の編集"
msgid "Parking"
msgstr "駐車場・駐輪場"
@@ -15209,17 +15580,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 "パークアンドライド"
@@ -15247,9 +15618,6 @@ msgstr "駐車区画"
msgid "Edit Parking space"
msgstr "駐車区画の編集"
-msgid "rooftop"
-msgstr "屋上"
-
msgid "Capacity"
msgstr "収容台数"
@@ -15260,7 +15628,7 @@ msgid "Covered (with roof)"
msgstr "屋根付き"
msgid "Time Limit (minutes)"
-msgstr "時間制限(分単位)"
+msgstr "制限時間（分）"
msgid "30+"
msgstr "30+"
@@ -15271,11 +15639,31 @@ 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 "駐車場の入口"
@@ -15424,6 +15812,9 @@ msgstr "充電ステーション"
msgid "Edit Charging Station (for electric cars)"
msgstr "充電ステーションの編集(電気自動車用)"
+msgid "Voltage"
+msgstr "電圧"
+
msgid "Amperage"
msgstr "電流"
@@ -15445,6 +15836,12 @@ msgstr "修理"
msgid "Edit Car Repair"
msgstr "自動車修理工場の編集"
+msgid "Parts"
+msgstr "部品"
+
+msgid "Edit Car Parts"
+msgstr "自動車部品店の編集"
+
msgid "Tyres"
msgstr "タイヤ店"
@@ -15472,6 +15869,12 @@ msgstr "レンタル"
msgid "Edit Car Rental"
msgstr "レンタカーの編集"
+msgid "Second hand"
+msgstr "中古品（セコハン）"
+
+msgid "only"
+msgstr "限定"
+
msgid "Sharing"
msgstr "カーシェアリング"
@@ -15496,22 +15899,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 "ブランド(メーカー)"
@@ -15533,9 +15920,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "部品"
-
msgid "Clothes"
msgstr "衣料品店"
@@ -15683,13 +16067,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 "プラットホーム"
@@ -15710,10 +16094,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番号"
@@ -15722,7 +16106,7 @@ msgid "UIC name"
msgstr "UIC名"
msgid "Stop Position"
-msgstr "停留所"
+msgstr "停止位置"
msgid "Platform"
msgstr "プラットホーム"
@@ -15730,6 +16114,9 @@ msgstr "プラットホーム"
msgid "Station or amenities"
msgstr "駅や設備"
+msgid "Edit Stop Position"
+msgstr "停止位置の編集"
+
msgid "Bus"
msgstr "バス"
@@ -15760,6 +16147,9 @@ msgstr "ケーブルカー"
msgid "Ferry"
msgstr "フェリー"
+msgid "Edit Platform"
+msgstr "プラットフォームの編集"
+
msgid "Bench"
msgstr "ベンチ"
@@ -15772,9 +16162,6 @@ msgstr "車いす"
msgid "limited"
msgstr "制限"
-msgid "only"
-msgstr "限定"
-
msgid "Highway platform (legacy)"
msgstr "道路上のプラットフォーム（旧）"
@@ -15784,9 +16171,14 @@ msgstr "鉄道のプラットホーム（旧）"
msgid "funicular"
msgstr "ケーブルカー"
+msgctxt "railway"
msgid "Station"
msgstr "駅"
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "駅の編集"
+
msgid "Building"
msgstr "建物"
@@ -15799,11 +16191,14 @@ msgstr "地下鉄入口の編集"
msgid "Ticket Machine"
msgstr "券売機"
+msgid "Edit Ticket Machine"
+msgstr "券売機の編集"
+
msgid "Reference Number"
msgstr "参照番号"
msgid "Coins"
-msgstr "コイン"
+msgstr "硬貨"
msgid "Notes"
msgstr "備考"
@@ -15818,19 +16213,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"
@@ -15879,7 +16266,7 @@ msgstr "バス乗り場の編集"
msgid "Taxi"
msgstr "タクシー"
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr "タクシー乗り場の編集"
msgid "Airport"
@@ -15933,6 +16320,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 "ゲート"
@@ -15955,21 +16357,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 "喫煙"
@@ -16159,9 +16546,6 @@ msgstr "ストリップクラブ"
msgid "Edit Stripclub"
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 "Tourism"
msgstr "旅行"
@@ -16183,9 +16567,15 @@ msgstr "展望塔"
msgid "Information Office"
msgstr "案内所"
+msgid "Edit Information Office"
+msgstr "案内所の編集"
+
msgid "Map"
msgstr "マップ"
+msgid "Edit Information Map"
+msgstr "案内地図の編集"
+
msgid "Detail Grade"
msgstr "詳細なグレード"
@@ -16198,6 +16588,9 @@ msgstr "ストリート"
msgid "scheme"
msgstr "スキーム"
+msgid "toposcope"
+msgstr "頂上標"
+
msgid "Shown Area"
msgstr "表示されたエリア"
@@ -16237,6 +16630,9 @@ msgstr "... 他の可能な輸送モード"
msgid "Information Board"
msgstr "情報板"
+msgid "Edit Information Board"
+msgstr "案内板の編集"
+
msgid "Board Content"
msgstr "掲示板の内容"
@@ -16258,24 +16654,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 "レジャー"
@@ -16403,50 +16811,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 "video"
+msgstr "ビデオ"
-msgid "buddhist"
-msgstr "仏教"
+msgid "Place of Worship"
+msgstr "礼拝所"
-msgid "christian"
-msgstr "キリスト教"
+msgid "Church"
+msgstr "教会"
-msgid "hindu"
-msgstr "ヒンズー教"
+msgid "Edit Church"
+msgstr "教会の編集"
-msgid "jain"
-msgstr "ジャイナ教"
+msgid "Building type"
+msgstr "建物の種類"
-msgid "jewish"
-msgstr "ユダヤ教"
+msgid "basilica"
+msgstr "バシリカ聖堂"
-msgid "muslim"
-msgstr "ムスリム"
+msgid "cathedral"
+msgstr "大聖堂"
-msgid "sikh"
-msgstr "シーク教"
+msgid "chapel"
+msgstr "礼拝堂"
-msgid "spiritualist"
-msgstr "降霊術士、イタコ"
+msgid "church"
+msgstr "教会"
-msgid "taoist"
-msgstr "道教"
-
-msgid "unitarian"
-msgstr "ユニテリアン"
-
-msgid "zoroastrian"
-msgstr "ゾロアスター教"
+msgid "temple"
+msgstr "寺院"
msgid "Denomination"
msgstr "宗派"
@@ -16463,8 +16865,14 @@ msgstr "カトリック"
msgid "evangelical"
msgstr "福音派"
+msgid "greek_catholic"
+msgstr "ギリシャカトリック"
+
+msgid "greek_orthodox"
+msgstr "ギリシャ正教会"
+
msgid "jehovahs_witness"
-msgstr "ものみの塔、エホバの証人"
+msgstr "エホバの証人"
msgid "lutheran"
msgstr "ルター派"
@@ -16475,6 +16883,9 @@ msgstr "メソジスト派"
msgid "mormon"
msgstr "モルモン"
+msgid "new_apostolic"
+msgstr "新使徒教会"
+
msgid "orthodox"
msgstr "ギリシャ正教系"
@@ -16493,38 +16904,139 @@ 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 "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 "モスク"
+
+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 "公共施設"
@@ -16613,6 +17125,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 "健康"
@@ -16694,12 +17212,66 @@ msgstr "動物病院"
msgid "Edit Veterinary"
msgstr "動物病院の編集"
-msgid "Drinking water"
-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 "電話"
@@ -16709,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 "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 "時計"
@@ -16718,30 +17314,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 "可視性/視認性"
@@ -16768,10 +17370,10 @@ msgid "Shows humidity"
msgstr "湿度の表示"
msgid "Recycling"
-msgstr "リサイクル"
+msgstr "資源回収場所"
-msgid "Edit Recycling station"
-msgstr "リサイクルステーションの編集"
+msgid "Edit Recycling Station"
+msgstr "資源回収場所の編集"
msgid "Batteries"
msgstr "バッテリー"
@@ -16797,21 +17399,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 "plastic"
-msgstr "プラスチック"
-
msgid "Amount of Seats"
msgstr "席の数"
@@ -16846,8 +17442,17 @@ msgstr "ハンティングスタンドの編集"
msgid "Height"
msgstr "高さ"
+msgctxt "height"
msgid "low"
-msgstr "低い"
+msgstr "低"
+
+msgctxt "height"
+msgid "half"
+msgstr "中"
+
+msgctxt "height"
+msgid "full"
+msgstr "高"
msgid "Hide"
msgstr "隠す"
@@ -16855,9 +17460,6 @@ msgstr "隠す"
msgid "Lock"
msgstr "ロック"
-msgid "Drinking Water"
-msgstr "飲料水"
-
msgid "Edit Source of Potable Water"
msgstr "飲料水供給所"
@@ -16889,6 +17491,9 @@ msgstr "ため池"
msgid "Diameter (in mm)"
msgstr "直径(mm単位)"
+msgid "Hydrant Position"
+msgstr "消火栓の位置"
+
msgctxt "hydrant position"
msgid "lane"
msgstr "レーン"
@@ -16926,117 +17531,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 "テニス"
@@ -17047,10 +17688,10 @@ msgid "Edit Sports Centre"
msgstr "スポーツセンターの編集"
msgid "Pitch"
-msgstr "運動場"
+msgstr "競技場"
msgid "Edit Pitch"
-msgstr "運動場の編集"
+msgstr "競技場の編集"
msgid "Racetrack"
msgstr "競技トラック"
@@ -17070,33 +17711,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 "ボーリング場"
@@ -17130,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 "ドッグレース"
@@ -17144,7 +17811,7 @@ msgstr "乗馬の編集"
msgctxt "riding"
msgid "pitch"
-msgstr "練習場"
+msgstr "競技場"
msgctxt "riding"
msgid "sports_centre"
@@ -17216,7 +17883,7 @@ msgid "Piste type"
msgstr "ゲレンデのタイプ"
msgid "downhill"
-msgstr "ダウンヒル"
+msgstr "滑降"
msgid "nordic"
msgstr "ノルディックスキー"
@@ -17230,38 +17897,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 "射撃"
@@ -17302,19 +17987,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 "ラウンダーズ"
@@ -17453,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 "ラジコンカー"
@@ -17465,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"
-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 "小屋"
+
+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 "タワー"
@@ -17743,72 +18510,188 @@ msgstr "営業時間"
msgid "Mo-Fr 22:00-05:00"
msgstr "Mo-Fr 22:00-05:00"
-msgid "Measurement Station"
-msgstr "測量所"
-
-msgid "Edit Measurement Station"
-msgstr "測量所を編集"
+msgid "Monitoring Station"
+msgstr "観測所"
-msgid "Measurement"
-msgstr "測定"
+msgid "Edit Monitoring Station"
+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 "automated"
+msgid "Recording:"
+msgstr "記録方式:"
+
+msgid "Automated"
msgstr "自動"
-msgid "remote"
-msgstr "遠隔"
+msgid "Manually"
+msgstr "手動"
+
+msgid "Remote"
+msgstr "遠隔操作"
-msgctxt "display"
-msgid "no"
-msgstr "no"
+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 "バイオ燃料"
@@ -17855,89 +18738,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 "biomass / waste"
+msgstr "バイオマス / 生ごみ"
-msgid "pumped-storage"
-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 "battery charging"
-msgstr "バッテリーの充電"
+msgid "reciprocating_engine"
+msgstr "エンジン"
-msgid "Power Station"
-msgstr "Power Station"
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr "バイオ燃料、バイオガス、ディーゼル、ガス、ガソリン"
-msgid "Edit Power Station"
-msgstr "Power Stationの編集"
+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 "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 "変電所"
@@ -17948,6 +18934,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 "配電箱"
@@ -17963,6 +18964,9 @@ msgstr "送電塔の編集"
msgid "Tower reference"
msgstr "塔の参照番号"
+msgid "steel"
+msgstr "鉄塔"
+
msgid "Pole"
msgstr "電柱"
@@ -17981,13 +18985,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 "電線の電流量"
@@ -17996,16 +18998,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 "史跡"
@@ -18094,10 +19096,10 @@ msgstr "キオスク"
msgid "Edit Kiosk"
msgstr "キオスクの編集"
-msgid "Baker"
+msgid "Bakery"
msgstr "パン屋"
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr "パン屋の編集"
msgid "Butcher"
@@ -18109,7 +19111,7 @@ msgstr "精肉店の編集"
msgid "Seafood"
msgstr "水産物店"
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr "水産物店の編集"
msgid "Deli (Fine Food)"
@@ -18130,6 +19132,9 @@ msgstr "市場"
msgid "Edit Marketplace"
msgstr "市場の編集"
+msgid "Organic"
+msgstr "自然素材"
+
msgid "Greengrocer"
msgstr "八百屋"
@@ -18142,9 +19147,6 @@ msgstr "農産物直売所"
msgid "Edit Farm Stand"
msgstr "農産物直売所の編集"
-msgid "Organic"
-msgstr "自然食品店"
-
msgid "Edit Organic/Bio"
msgstr "自然食品店の編集"
@@ -18170,7 +19172,7 @@ msgid "Edit Beverages Shop"
msgstr "飲料店の編集"
msgid "Edit Clothes Shop"
-msgstr "洋服店の編集"
+msgstr "衣料品店の編集"
msgid "Boutique"
msgstr "ブティック"
@@ -18212,13 +19214,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 "コンピュータ店"
@@ -18235,27 +19237,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 "お金"
@@ -18278,6 +19279,12 @@ msgstr "両替の編集"
msgid "Edit Automated Teller Machine"
msgstr "ATMの編集"
+msgid "Pawnbroker"
+msgstr "質屋"
+
+msgid "Edit Pawnbroker"
+msgstr "質屋の編集"
+
msgid "Department Store"
msgstr "百貨店"
@@ -18297,10 +19304,10 @@ msgid "Edit Chemist"
msgstr "薬局の編集"
msgid "Hairdresser"
-msgstr "理髪店・美容院"
+msgstr "理美容店"
msgid "Edit Hairdresser"
-msgstr "理髪店・美容院の編集"
+msgstr "理美容店の編集"
msgid "Optician"
msgstr "眼鏡店"
@@ -18314,11 +19321,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 "生花店"
@@ -18347,7 +19375,7 @@ msgstr "金物屋の編集"
msgid "Paint"
msgstr "画材店"
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr "画材店の編集"
msgid "Furniture"
@@ -18359,19 +19387,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"
@@ -18387,10 +19415,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 "Newsagent''s shop"
msgstr "新聞・雑誌販売店"
@@ -18407,7 +19441,7 @@ msgstr "旅行代理店の編集"
msgid "Musical Instrument"
msgstr "楽器店"
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr "楽器店の編集"
msgid "Toys"
@@ -18620,6 +19654,12 @@ msgstr "山頂"
msgid "Edit Peak"
msgstr "山頂の編集"
+msgid "Saddle"
+msgstr "鞍部"
+
+msgid "Edit Saddle"
+msgstr "鞍部の編集"
+
msgid "Glacier"
msgstr "氷河"
@@ -18659,26 +19699,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 "人工林"
@@ -18686,15 +19735,6 @@ msgstr "人工林"
msgid "Edit Forest Landuse"
msgstr "人工林の編集"
-msgid "coniferous"
-msgstr "針葉樹林"
-
-msgid "deciduous"
-msgstr "広葉樹林"
-
-msgid "mixed"
-msgstr "雑木林"
-
msgid "Grassland"
msgstr "草地"
@@ -18770,6 +19810,12 @@ msgstr "牧草地"
msgid "Edit Meadow Landuse"
msgstr "牧草地の編集"
+msgid "Orchard"
+msgstr "果樹園"
+
+msgid "Edit Orchard Landuse"
+msgstr "果樹園の編集"
+
msgid "Vineyard"
msgstr "ぶどう園"
@@ -18824,7 +19870,7 @@ msgstr "レクレーション広場"
msgid "Edit Recreation Ground Landuse"
msgstr "レクレーション広場の編集"
-msgid "Residential area"
+msgid "Residential Area"
msgstr "住宅地"
msgid "Edit Residential Landuse"
@@ -18836,6 +19882,9 @@ msgstr "（教会・寺院にある）墓所"
msgid "Edit Graveyard"
msgstr "墓所の編集"
+msgid "shinto"
+msgstr "神道"
+
msgid "Cemetery"
msgstr "霊園"
@@ -18911,6 +19960,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 "住所の編集"
@@ -18947,6 +20023,18 @@ msgstr "偶数"
msgid "alphabetic"
msgstr "アルファベット順"
+msgid "Accuracy"
+msgstr "精度"
+
+msgid "actual"
+msgstr "確実"
+
+msgid "estimate"
+msgstr "大体"
+
+msgid "potential"
+msgstr "恐らく"
+
msgid "Contact (common schema)"
msgstr "連絡先（一般の書式）"
@@ -19023,7 +20111,7 @@ msgid "entrances to the site, on the perimeter"
msgstr "境界上のサイト入口"
msgid "members of site"
-msgstr "サイトのメンバ"
+msgstr "サイトのメンバー"
msgid "Turn restriction"
msgstr "進行方向制限"
@@ -19107,7 +20195,7 @@ msgid "where enforcement ends"
msgstr "取締り終了位置"
msgid "traffic light or barrier that stops you"
-msgstr "検問場所"
+msgstr "停止信号または柵"
msgid "General route"
msgstr "一般ルート"
@@ -19115,21 +20203,50 @@ msgstr "一般ルート"
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 "スキー"
+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 "シンボルの説明"
@@ -19140,7 +20257,7 @@ msgid "proposed"
msgstr "案"
msgid "alternate"
-msgstr "代替路"
+msgstr "迂回路"
msgid "temporary"
msgstr "一時的"
@@ -19167,37 +20284,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 "通りに所属する住所"
@@ -19209,16 +20329,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、歩行用）"
@@ -19248,7 +20368,7 @@ msgid "Waterway"
msgstr "水路"
msgid "Edit Waterway"
-msgstr "水域の編集"
+msgstr "水路の編集"
msgid "Subtype of waterway (largest one of members)"
msgstr "水域の種類（メンバーで最も大きいもの）"
@@ -19293,7 +20413,7 @@ msgid "branch waterways (no riverbank)"
msgstr "支流（川岸なし）"
msgid "spring of waterway"
-msgstr "源流"
+msgstr "源泉"
msgid "Length (meters)"
msgstr "長さ（m）"
@@ -19302,46 +20422,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 "川岸"
@@ -19353,49 +20485,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 "電力"
@@ -19413,22 +20548,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 "ホテル"
@@ -19446,7 +20581,7 @@ msgid "landfill"
msgstr "埋め立て地"
msgid "basin"
-msgstr "水たまり、窪地"
+msgstr "水場"
msgid "forest"
msgstr "人工林"
@@ -19502,11 +20637,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 "住所"
@@ -19520,9 +20658,6 @@ msgstr "村・市"
msgid "One Way"
msgstr "一方通行"
-msgid "Church"
-msgstr "教会"
-
msgid "Fuel Station"
msgstr "ガソリンスタンド"
@@ -19542,64 +20677,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 "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 "incline without highway"
-msgstr "道路でないのにinclineがある"
+msgid "missing transformer=*"
+msgstr "transformer=*がない"
+
+msgid "incline without highway or railway"
+msgstr "道路または鉄道ではないのにinclineがある"
msgid "junction without highway"
msgstr "道路でないのにjunctionがある"
@@ -19610,8 +20778,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がある"
@@ -19628,8 +20796,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がある"
@@ -19745,20 +20913,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"
-msgstr "道路/線路/水路ではないのにbridgeがある"
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr "bridgeがあるが道路/鉄道/水路/プラットフォーム/ゲレンデ/パイプラインではない"
-msgid "psv without highway/railway/waterway"
-msgstr "道路/線路/水路ではないのにpsvがある"
+msgid "psv without highway/railway/waterway/parking"
+msgstr "psvがあるが道路/鉄道/水路/駐車場ではない"
msgid "width without physical linear feature"
-msgstr "物理的な線形の地物ではないのにwidthが設定されている"
+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 "maxspeed without highway/railway/traffic_sign"
-msgstr "道路/鉄道/信号ではないのにmaxspeedがある"
+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 "source:ref:INSEE without ref:INSEE"
+msgstr "ref:INSEEがないのにsource:ref:INSEEがある"
+
+msgid "source:lit without lit"
+msgstr "litがないのにsource:litがある"
+
+msgid "source:hgv without hgv"
+msgstr "hgvがないのにsource:hgvがある"
+
+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 "宗教に宗派がない"
@@ -19776,8 +21055,47 @@ 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 "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 ""
+"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"
@@ -19788,20 +21106,29 @@ 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トレース"
+
msgid "OpenStreetMap (Mapnik)"
msgstr "OpenStreetMap (Mapnik)"
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik Black & White)"
-msgid "Skobbler"
-msgstr "Skobbler"
+msgid "skobbler"
+msgstr "skobbler"
+
+msgid "skobbler heatmap"
+msgstr "skobbler heatmap"
msgid "skobbler heatmap"
msgstr "skobbler heatmap"
@@ -19821,8 +21148,8 @@ msgstr "OpenStreetMap (German Style)"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgid "2u"
-msgstr "2u"
+msgid "osmfr"
+msgstr "osmfr"
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI black-and-white 2.5m"
@@ -19830,6 +21157,9 @@ 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 (base map)"
@@ -19978,6 +21308,31 @@ 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)"
@@ -20143,6 +21498,9 @@ 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 "New & Misaligned TIGER Roads (TIGER 2013)"
+
msgid "OSM - Tiger Edited Map"
msgstr "OSM - Tiger Edited Map"
@@ -20188,6 +21546,39 @@ msgstr "OS Scottish Popular historic"
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 "configure the connected DG100"
+msgstr "接続されたDG100の設定"
+
+msgid "delete data after import"
+msgstr "インポート後データを削除"
+
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSVファイル"
@@ -20316,12 +21707,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 "トレースのアップロード"
@@ -20389,6 +21780,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 "高度プロファイルウィンドウを開きます。"
@@ -20410,14 +21813,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}'' の高度プロファイルです。"
@@ -20502,7 +21899,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"
@@ -20685,15 +22082,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 "Housenumber increment:"
+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 "既定のイメージ投影法"
@@ -20858,10 +22258,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 "市区:"
@@ -20893,8 +22293,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文字でなければなりません"
@@ -21240,19 +22640,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 "巨大建物モード"
@@ -21441,6 +22832,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レイヤーを選択。"
@@ -21459,12 +22853,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "高"
-
-msgid "medium"
-msgstr "中"
-
msgid "symbol"
msgstr "シンボル"
@@ -21606,6 +22994,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 "水平線を表示:"
@@ -21623,6 +23014,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=...\" を要素に追加しますか？"
@@ -21869,8 +23263,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 "ベクタライズされました。"
@@ -21919,7 +23316,7 @@ msgstr "選択した配色を一覧から削除する。"
msgid "Color Schemes"
msgstr "配色"
-msgid "Adress"
+msgid "Address"
msgstr "住所"
msgid "Split area"
@@ -22147,27 +23544,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 "デバイスからデータをインポート"
@@ -22607,7 +23986,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 "本当にこの位置合わせ座標は間違っていると思いますか？"
@@ -23274,9 +24653,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 "ミシガン左折"
@@ -23427,7 +24824,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 "
@@ -23546,12 +24943,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 "モジュール"
@@ -23935,15 +25332,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 "Process queue"
msgstr "処理キュー"
@@ -23996,18 +25390,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 "ブラウザーで開く"
@@ -24354,6 +25736,27 @@ msgstr "テスト失敗: mtimeを読み込めませんでした。"
msgid "Test failed: Could not write mtime."
msgstr "テスト失敗: mtimeを書き込めませんでした。"
+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} の現在の位置調整を保存しますか？"
@@ -24507,6 +25910,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"
@@ -24552,7 +25958,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}個の範囲外にあった点が移動されました"
@@ -24826,9 +26232,6 @@ msgstr "GPXファイルにトラックやウェイポイントがありません
msgid "Create Stops from GPX"
msgstr "GPXから停留所を作成"
-msgid "Tracks"
-msgstr "トラック"
-
msgid "Tracks in this GPX file:"
msgstr "トラックが含まれるGPXファイル:"
@@ -25044,6 +26447,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} が見つかりません"
@@ -25078,15 +26484,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 "国のプリセット:"
@@ -25201,9 +26623,6 @@ msgstr "ルーティング プラグインの設定"
msgid "Configure routing preferences."
msgstr "ルーティング設定情報の構成"
-msgid "Highway type"
-msgstr "ハイウェイ タイプ"
-
msgid "Speed (Km/h)"
msgstr "速度 (Km/h)"
@@ -25390,20 +26809,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の自動保存"
@@ -25589,7 +27008,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 "
@@ -25620,6 +27039,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"
@@ -25658,6 +27171,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..."
@@ -25818,9 +27334,6 @@ msgstr "署名はキャンセルされました"
msgid "Please give a tolerance in meters"
msgstr "メートル単位で誤差を入力してください。"
-msgid "Accuracy"
-msgstr "精度"
-
msgid "Select as much as you like:"
msgstr "お好きなように選択してください:"
@@ -26025,7 +27538,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 "強制保存しますか？"
@@ -26051,7 +27564,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 "
@@ -26095,11 +27608,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 "問題はありません"
@@ -26539,7 +28052,7 @@ msgstr "リレーションを貼り付け"
msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
-msgstr "選択されたオブジェクトに蓄積されたオブジェクトからリレーションのメンバーを貼り付けます"
+msgstr "選択されたオブジェクトに蓄積されたオブジェクトからリレーションの所属を貼り付けます"
msgid "Split Object"
msgstr "オブジェクトを分割"
@@ -26751,8 +28264,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 "冗長なメソッドの繰り返し回数の限界を超えました。メソッドを単純化してください。"
@@ -26863,9 +28375,6 @@ msgstr "ノードの選択を解除"
msgid "Removes all nodes from selection"
msgstr "選択したものからすべてのノードを選択解除"
-msgid "Video"
-msgstr "ビデオ"
-
msgid "Import Video"
msgstr "ビデオをインポート"
@@ -27019,7 +28528,7 @@ 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 "
@@ -27152,9 +28661,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 a9e8285..0cdbeae 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-08-04 03:41+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-08-05 04:42+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "გასახსნელ ლინკს ამ პლატფორმაზე არ აქვს მხარდაჭერა (''{0}'')"
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 ""
@@ -253,9 +259,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr "გთხოვ მონიშნე ოთხი წერტილი მაინც"
-msgid "Information"
-msgstr "ინფორმაცია"
-
msgid "Align Nodes in Line"
msgstr ""
@@ -292,6 +295,9 @@ msgstr "შემდეგი"
msgid "Nothing selected to zoom to."
msgstr "მიახლოვებისთვის არაფერი არ არის მონიშნული"
+msgid "Information"
+msgstr "ინფორმაცია"
+
msgid "Zoom to {0}"
msgstr "მიაახლოვე {0}"
@@ -346,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} გზა"
@@ -529,6 +534,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -642,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 ""
@@ -792,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"
@@ -978,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 ""
@@ -1001,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>"
@@ -1169,9 +1170,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1310,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"
@@ -1405,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 ""
@@ -1689,6 +1708,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1908,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] ""
@@ -2334,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 ""
@@ -2530,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 ""
@@ -2617,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 ""
@@ -2653,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"
@@ -2679,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}''"
@@ -2784,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] ""
@@ -2844,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"
@@ -2875,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"
@@ -2899,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 ""
@@ -2929,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 ""
@@ -2949,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 ""
@@ -2958,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 ""
@@ -2978,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}"
@@ -3009,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}''."
@@ -3166,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 ""
@@ -3274,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 ""
@@ -3312,9 +3341,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3353,6 +3379,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3377,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 ""
@@ -3436,6 +3474,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3518,6 +3559,15 @@ 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 ""
@@ -3587,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 ""
@@ -3644,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})"
@@ -3682,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}"
@@ -3819,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"
@@ -3894,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 ""
@@ -3924,9 +3983,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3951,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''"
@@ -4017,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 ""
@@ -4137,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"
@@ -4366,6 +4405,18 @@ 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 ""
@@ -4470,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 ""
@@ -4770,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 "> 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"
@@ -4807,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"
@@ -4859,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 ""
@@ -5116,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 ""
@@ -5644,6 +5692,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5727,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 ""
@@ -5817,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 ""
@@ -5988,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 ""
@@ -6275,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"
@@ -6341,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"
@@ -6383,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)"
@@ -6543,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"
@@ -6861,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 ""
@@ -6992,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, "
@@ -7016,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 ""
@@ -7129,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."
@@ -7228,6 +7306,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7315,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"
@@ -7334,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 ""
@@ -7400,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"
@@ -7476,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 ""
@@ -7491,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"
@@ -7707,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 "
@@ -7721,10 +7800,26 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 ""
+
+msgid "Cancel and return to the previous dialog"
msgstr ""
msgid "Do not show this message again"
@@ -7736,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 ""
@@ -7743,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 ..."
@@ -7856,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] ""
@@ -7868,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>"
@@ -7884,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:"
@@ -8030,7 +8140,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8060,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"
@@ -8413,9 +8523,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8434,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 ""
@@ -8491,6 +8601,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8557,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 ""
@@ -8740,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}''..."
@@ -8762,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"
@@ -8772,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:"
@@ -8993,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}''"
@@ -9708,6 +9816,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9776,6 +9917,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9829,6 +9973,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 ""
@@ -10285,6 +10434,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 ""
@@ -10348,7 +10503,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 ""
@@ -10606,40 +10761,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}''"
@@ -10692,8 +10847,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:"
@@ -10702,20 +10857,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 ""
@@ -10797,14 +10957,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"
@@ -10877,7 +11031,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10956,9 +11110,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10977,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 ""
@@ -11006,9 +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 ""
@@ -11039,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 ""
@@ -11079,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..."
@@ -11195,6 +11392,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11210,12 +11410,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}."
@@ -11294,7 +11502,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11393,35 +11601,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 ""
@@ -11431,8 +11615,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 ..."
@@ -11459,10 +11643,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>"
@@ -11546,8 +11727,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}."
@@ -11744,7 +11925,7 @@ 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}"
@@ -11790,6 +11971,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."
@@ -11820,19 +12010,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 ""
@@ -11854,11 +12044,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 ""
@@ -11928,13 +12130,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}''"
@@ -12077,10 +12279,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"
@@ -12095,22 +12297,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}''"
@@ -12179,8 +12380,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..."
@@ -12195,9 +12395,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}''"
@@ -12519,12 +12734,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12535,30 +12749,73 @@ 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 "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] ""
+
+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"
@@ -12569,9 +12826,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."
@@ -12894,6 +13165,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 ""
@@ -13133,6 +13409,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."
@@ -13182,9 +13461,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 ""
@@ -13221,6 +13497,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 ""
@@ -13351,6 +13632,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13441,6 +13725,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 ""
@@ -13459,10 +13787,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13474,6 +13802,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13501,18 +13832,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 ""
@@ -13522,9 +13847,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13534,13 +13856,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13588,6 +13910,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13672,6 +13997,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13776,21 +14104,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 ""
@@ -13806,10 +14143,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"
@@ -13845,7 +14182,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13914,12 +14251,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 ""
@@ -13935,15 +14278,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 ""
@@ -13965,6 +14299,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13974,6 +14317,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13983,10 +14329,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14019,9 +14362,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14064,6 +14404,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14079,6 +14425,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14148,19 +14497,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14191,6 +14534,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14200,10 +14544,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14257,12 +14601,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14323,12 +14661,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14368,9 +14715,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14404,6 +14748,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 ""
@@ -14485,18 +14844,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 ""
@@ -14572,7 +14936,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14596,10 +14960,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"
@@ -14611,9 +14978,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14665,6 +15029,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14677,6 +15044,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14788,11 +15190,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14804,11 +15204,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14827,10 +15225,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14860,9 +15258,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14884,10 +15279,29 @@ 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"
@@ -15037,6 +15451,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15058,6 +15475,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15085,6 +15508,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15109,22 +15538,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 ""
@@ -15146,9 +15559,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15343,6 +15753,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15373,6 +15786,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15385,9 +15801,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15397,9 +15810,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15412,6 +15830,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15436,14 +15857,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15492,7 +15905,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15546,41 +15959,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"
@@ -15772,9 +16185,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15796,9 +16206,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15811,6 +16227,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15850,6 +16269,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15871,22 +16293,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"
@@ -16016,49 +16450,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"
@@ -16076,6 +16504,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16088,6 +16522,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16106,37 +16543,137 @@ 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"
@@ -16226,6 +16763,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 ""
@@ -16307,128 +16850,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16459,16 +17080,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16502,6 +17129,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16539,117 +17169,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 ""
@@ -16683,33 +17349,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 ""
@@ -16743,6 +17419,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 ""
@@ -16843,36 +17535,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 ""
@@ -16915,19 +17625,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 ""
@@ -17066,6 +17772,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 ""
@@ -17078,60 +17796,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 ""
@@ -17356,41 +18148,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"
@@ -17399,7 +18217,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17411,12 +18229,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 ""
@@ -17468,88 +18376,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17561,6 +18572,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 ""
@@ -17576,6 +18602,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17594,11 +18623,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17707,10 +18734,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17722,7 +18749,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17743,6 +18770,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17755,9 +18785,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17827,7 +18854,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17848,13 +18875,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"
@@ -17863,7 +18890,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17891,6 +18917,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17927,10 +18959,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"
@@ -17960,7 +19013,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17972,19 +19025,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"
@@ -18020,7 +19073,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18233,6 +19286,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18272,24 +19331,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 ""
@@ -18299,15 +19367,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18383,6 +19442,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18437,7 +19502,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18449,6 +19514,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18485,43 +19553,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18560,6 +19655,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18728,21 +19835,50 @@ 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 ""
+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 ""
@@ -18788,19 +19924,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"
@@ -18824,7 +19963,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18920,18 +20059,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 ""
@@ -18941,7 +20089,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18950,10 +20101,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18971,6 +20122,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18986,28 +20140,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"
@@ -19028,19 +20182,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"
@@ -19115,10 +20269,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19133,9 +20290,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19163,6 +20317,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19208,10 +20365,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"
@@ -19223,7 +20410,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"
@@ -19241,7 +20428,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19358,19 +20545,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 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"
@@ -19389,7 +20687,46 @@ 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 "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 "Landsat"
@@ -19401,19 +20738,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 "skobbler heatmap"
@@ -19434,7 +20780,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19443,6 +20789,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19589,6 +20938,29 @@ 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 ""
@@ -19754,6 +21126,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19799,6 +21174,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19985,19 +21393,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20021,13 +21441,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20290,10 +21704,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20497,7 +21914,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"
@@ -20768,15 +22185,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20947,6 +22355,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 ""
@@ -20965,12 +22376,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21106,6 +22511,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 ""
@@ -21123,6 +22531,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 ""
@@ -21349,7 +22760,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."
@@ -21399,7 +22813,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21584,6 +22998,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21623,27 +23102,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 ""
@@ -22721,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 ""
@@ -23370,9 +24848,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23425,18 +24900,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 ""
@@ -23783,6 +25246,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23934,6 +25418,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 ""
@@ -24251,9 +25738,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24469,6 +25953,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 ""
@@ -24501,15 +25988,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 ""
@@ -24624,9 +26127,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24805,19 +26305,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"
@@ -25033,6 +26533,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 ""
@@ -25069,6 +26658,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..."
@@ -25221,9 +26813,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26209,9 +27798,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26490,9 +28076,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 4e0e95f..059a242 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-08-04 03:41+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-08-05 04:48+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr "លក្ខខណ្ឌក្នុងការប្រើប្រា
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -163,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 "
@@ -258,9 +260,6 @@ msgstr "ឧបករ ៖ {0}"
msgid "Please select at least four nodes."
msgstr "សូមជ្រើសរើសយ៉ាងហោចណាស់ ថ្នាំងចំនួន ៤"
-msgid "Information"
-msgstr "ពត៌មាន"
-
msgid "Align Nodes in Line"
msgstr "តម្រង់ថ្នាំងជាបន្ទាត់ខ្សែ"
@@ -297,6 +296,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr "មិនមានអ្វីត្រូវបានជ្រើសរើសដើម្បីពង្រីកចូលទៅ។"
+msgid "Information"
+msgstr "ពត៌មាន"
+
msgid "Zoom to {0}"
msgstr "ពង្រីកចូលទៅ {0}"
@@ -353,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} ផ្លូវ"
@@ -534,6 +536,9 @@ msgstr "ប្រវត្តិ"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -647,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 ""
@@ -797,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"
@@ -983,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 ""
@@ -1006,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>"
@@ -1174,9 +1172,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1315,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"
@@ -1410,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 "មិនធ្វើវិញ"
@@ -1694,6 +1710,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1913,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] ""
@@ -2339,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 ""
@@ -2535,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 ""
@@ -2622,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 ""
@@ -2658,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"
@@ -2683,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}''"
@@ -2788,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] ""
@@ -2848,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"
@@ -2879,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 ""
@@ -2903,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 ""
@@ -2933,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 ""
@@ -2953,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 ""
@@ -2962,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 ""
@@ -2982,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}"
@@ -3013,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}''."
@@ -3168,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 ""
@@ -3276,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 ""
@@ -3314,9 +3340,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3355,6 +3378,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3379,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 ""
@@ -3438,6 +3473,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3520,6 +3558,15 @@ 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 ""
@@ -3589,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 ""
@@ -3646,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})"
@@ -3684,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}"
@@ -3821,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"
@@ -3896,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 ""
@@ -3926,9 +3982,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3953,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''"
@@ -4019,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 ""
@@ -4138,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"
@@ -4367,6 +4403,18 @@ 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 "សំលេង"
@@ -4471,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 ""
@@ -4771,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"
@@ -4808,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"
@@ -4860,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 ""
@@ -5117,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 ""
@@ -5645,6 +5690,9 @@ msgstr "បង្ហាញ/លាក់"
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5728,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 "ទំនាក់ទំនង"
@@ -5818,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 ""
@@ -5989,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 ""
@@ -6276,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"
@@ -6342,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 "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"
@@ -6384,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)"
@@ -6544,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"
@@ -6862,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"
@@ -6993,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 ""
@@ -7017,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 ""
@@ -7130,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."
@@ -7229,6 +7304,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7316,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"
@@ -7335,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 ""
@@ -7401,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"
@@ -7477,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 ""
@@ -7492,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"
@@ -7708,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 "
@@ -7722,7 +7798,23 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+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 ""
msgid "Cancel and return to the previous dialog"
@@ -7737,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 ""
@@ -7744,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 ..."
@@ -7857,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] ""
@@ -7869,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>"
@@ -7885,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:"
@@ -8031,7 +8138,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8061,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"
@@ -8414,9 +8521,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8435,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 ""
@@ -8492,6 +8599,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8558,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 ""
@@ -8741,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}''..."
@@ -8763,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"
@@ -8773,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:"
@@ -8994,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}''"
@@ -9709,6 +9814,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9777,6 +9915,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9830,6 +9971,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 ""
@@ -10286,6 +10432,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 ""
@@ -10349,7 +10501,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 ""
@@ -10607,40 +10759,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}''"
@@ -10693,8 +10845,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:"
@@ -10703,20 +10855,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 ""
@@ -10798,14 +10955,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"
@@ -10878,7 +11029,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10957,9 +11108,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10978,6 +11126,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 ""
@@ -11007,9 +11163,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 ""
@@ -11040,7 +11236,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 ""
@@ -11080,28 +11276,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..."
@@ -11196,6 +11390,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11211,12 +11408,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}."
@@ -11295,7 +11500,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11394,35 +11599,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 ""
@@ -11432,8 +11613,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 ..."
@@ -11460,10 +11641,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>"
@@ -11547,8 +11725,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}."
@@ -11745,7 +11923,7 @@ 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}"
@@ -11791,6 +11969,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."
@@ -11821,19 +12008,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 ""
@@ -11855,11 +12042,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 ""
@@ -11929,13 +12128,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}''"
@@ -12078,10 +12277,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"
@@ -12096,22 +12295,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}''"
@@ -12180,8 +12378,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..."
@@ -12196,9 +12393,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}''"
@@ -12520,12 +12732,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12536,30 +12747,73 @@ 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 "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] ""
+
+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"
@@ -12570,9 +12824,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."
@@ -12895,6 +13163,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 ""
@@ -13134,6 +13407,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."
@@ -13183,9 +13459,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 ""
@@ -13222,6 +13495,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 ""
@@ -13352,6 +13630,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13442,6 +13723,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 ""
@@ -13460,10 +13785,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13475,6 +13800,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13502,18 +13830,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 ""
@@ -13523,9 +13845,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13535,15 +13854,15 @@ msgstr ""
msgid "private"
msgstr ""
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr ""
msgid "forestry"
msgstr ""
-msgid "no"
-msgstr "ទេ"
-
msgid "official"
msgstr ""
@@ -13589,6 +13908,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13673,6 +13995,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13777,21 +14102,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 ""
@@ -13807,10 +14141,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"
@@ -13846,7 +14180,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13915,12 +14249,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 ""
@@ -13936,15 +14276,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 ""
@@ -13966,6 +14297,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13975,6 +14315,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13984,10 +14327,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14020,9 +14360,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14065,6 +14402,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14080,6 +14423,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14149,19 +14495,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14192,6 +14532,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14201,10 +14542,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14258,12 +14599,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14324,12 +14659,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14369,9 +14713,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14405,6 +14746,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 ""
@@ -14486,18 +14842,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 ""
@@ -14573,7 +14934,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14597,10 +14958,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"
@@ -14612,9 +14976,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14666,6 +15027,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14678,6 +15042,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14789,11 +15188,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14805,11 +15202,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14828,10 +15223,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14861,9 +15256,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14885,10 +15277,29 @@ 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"
@@ -15038,6 +15449,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15059,6 +15473,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15086,6 +15506,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15110,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 ""
@@ -15147,9 +15557,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15344,6 +15751,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15374,6 +15784,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15386,9 +15799,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15398,9 +15808,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15413,6 +15828,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15437,14 +15855,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15493,7 +15903,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15547,41 +15957,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"
@@ -15773,9 +16183,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15797,9 +16204,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15812,6 +16225,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15851,6 +16267,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15872,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"
@@ -16017,49 +16448,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"
@@ -16077,6 +16502,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16089,6 +16520,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16107,37 +16541,137 @@ 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"
@@ -16227,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 ""
@@ -16308,128 +16848,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16460,16 +17078,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16503,6 +17127,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16540,117 +17167,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 ""
@@ -16684,33 +17347,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 ""
@@ -16744,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 ""
@@ -16844,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 ""
@@ -16916,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 ""
@@ -17067,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 ""
@@ -17079,60 +17794,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 ""
@@ -17357,41 +18146,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"
@@ -17400,7 +18215,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17412,12 +18227,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 ""
@@ -17469,88 +18374,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17562,6 +18570,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 ""
@@ -17577,6 +18600,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17595,11 +18621,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17708,10 +18732,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17723,7 +18747,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17744,6 +18768,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17756,9 +18783,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17828,7 +18852,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17849,13 +18873,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"
@@ -17864,7 +18888,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17892,6 +18915,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17928,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"
@@ -17961,7 +19011,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17973,19 +19023,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"
@@ -18021,7 +19071,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18234,6 +19284,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18273,24 +19329,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 ""
@@ -18300,15 +19365,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18384,6 +19440,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18438,7 +19500,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18450,6 +19512,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18486,43 +19551,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18561,6 +19653,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18729,21 +19833,50 @@ 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 ""
+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 ""
@@ -18789,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"
@@ -18825,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)"
@@ -18921,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 ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18942,7 +20087,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18951,10 +20099,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18972,6 +20120,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18987,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"
@@ -19029,19 +20180,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"
@@ -19116,10 +20267,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19134,9 +20288,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19164,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 ""
@@ -19209,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"
@@ -19224,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"
@@ -19242,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"
@@ -19359,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"
+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 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"
@@ -19390,7 +20685,46 @@ 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 "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 "Landsat"
@@ -19402,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 "skobbler heatmap"
@@ -19435,7 +20778,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19444,6 +20787,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19590,6 +20936,29 @@ 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 ""
@@ -19755,6 +21124,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19800,6 +21172,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19986,19 +21391,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20022,13 +21439,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20291,10 +21702,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20498,7 +21912,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"
@@ -20769,15 +22183,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20948,6 +22353,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 ""
@@ -20966,12 +22374,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21107,6 +22509,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 ""
@@ -21124,6 +22529,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 ""
@@ -21350,7 +22758,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."
@@ -21400,7 +22811,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21585,6 +22996,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21624,27 +23100,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 ""
@@ -22722,9 +24180,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 ""
@@ -23371,9 +24846,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23426,18 +24898,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 ""
@@ -23784,6 +25244,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23935,6 +25416,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 ""
@@ -24252,9 +25736,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24470,6 +25951,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 ""
@@ -24502,15 +25986,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 ""
@@ -24625,9 +26125,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24806,19 +26303,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"
@@ -25034,6 +26531,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 ""
@@ -25070,6 +26656,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..."
@@ -25222,9 +26811,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26210,9 +27796,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26491,9 +28074,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 a8e3f96..f11d946 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-08-04 03:41+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-08-05 04:49+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr "이용 약관 배경"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "현재 플랫폼(\"{0}\")에서 링크를 여는것을 지원하지 않습니다."
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -162,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 ""
@@ -253,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를 선에 정렬"
@@ -292,6 +295,9 @@ msgstr "다음"
msgid "Nothing selected to zoom to."
msgstr "줌을 위한 선택이 없습니다."
+msgid "Information"
+msgstr "정보"
+
msgid "Zoom to {0}"
msgstr "{0}으로 줌"
@@ -346,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를 결합"
@@ -522,6 +528,9 @@ msgstr "이력"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "OSM 도로, 노드, 또는 릴레이션에 대한 이력 정보 표시"
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr "이력(웹)"
@@ -634,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 ""
@@ -784,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"
@@ -970,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 ""
@@ -993,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>"
@@ -1160,9 +1162,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1299,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"
@@ -1394,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 "실행 취소"
@@ -1678,6 +1698,9 @@ 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} 남음)"
@@ -1896,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] ""
@@ -2322,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 ""
@@ -2520,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 ""
@@ -2607,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} 변경"
@@ -2643,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"
@@ -2668,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}''"
@@ -2768,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를 회전"
@@ -2827,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"
@@ -2858,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 ""
@@ -2882,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 ""
@@ -2912,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 ""
@@ -2932,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 ""
@@ -2941,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 ""
@@ -2961,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}"
@@ -2992,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}''."
@@ -3147,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 ""
@@ -3255,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 ""
@@ -3293,9 +3323,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3334,6 +3361,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3358,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 ""
@@ -3417,6 +3456,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3499,6 +3541,15 @@ 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 ""
@@ -3568,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 ""
@@ -3625,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})"
@@ -3663,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}"
@@ -3800,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"
@@ -3875,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 ""
@@ -3905,9 +3965,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3932,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''"
@@ -3998,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 ""
@@ -4118,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"
@@ -4347,6 +4387,18 @@ 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 ""
@@ -4451,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 ""
@@ -4751,29 +4790,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"
@@ -4788,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"
@@ -4840,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 ""
@@ -5097,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 ""
@@ -5625,6 +5674,9 @@ msgstr "보이기/숨기기"
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5708,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 ""
@@ -5798,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 ""
@@ -5969,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 ""
@@ -6256,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"
@@ -6322,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 "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 "모든 대상에서 선택된 key 지우기"
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6364,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)"
@@ -6524,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"
@@ -6842,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 "책갈피"
@@ -6973,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, "
@@ -6997,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 ""
@@ -7110,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."
@@ -7209,6 +7288,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7304,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"
@@ -7323,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 ""
@@ -7389,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"
@@ -7465,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 ""
@@ -7480,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"
@@ -7696,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 "
@@ -7710,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 ""
@@ -7725,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 ""
@@ -7732,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 ..."
@@ -7845,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] ""
@@ -7857,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>"
@@ -7873,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:"
@@ -8019,7 +8130,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8049,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"
@@ -8402,9 +8513,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8423,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 ""
@@ -8480,6 +8591,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8546,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 ""
@@ -8729,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}''..."
@@ -8751,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"
@@ -8761,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:"
@@ -8982,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}''"
@@ -9697,6 +9806,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9765,6 +9907,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9818,6 +9963,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 ""
@@ -10274,6 +10424,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 ""
@@ -10337,7 +10493,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 ""
@@ -10595,40 +10751,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}''"
@@ -10681,8 +10837,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:"
@@ -10691,20 +10847,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 ""
@@ -10786,14 +10947,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"
@@ -10866,7 +11021,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10945,9 +11100,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10966,6 +11118,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 ""
@@ -10995,9 +11155,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 ""
@@ -11028,7 +11228,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 ""
@@ -11068,28 +11268,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..."
@@ -11184,6 +11382,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11199,12 +11400,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}."
@@ -11283,7 +11492,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11382,35 +11591,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 ""
@@ -11420,8 +11605,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 ..."
@@ -11448,10 +11633,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>"
@@ -11535,8 +11717,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}."
@@ -11733,7 +11915,7 @@ 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}"
@@ -11779,6 +11961,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."
@@ -11809,19 +12000,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 ""
@@ -11843,11 +12034,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 ""
@@ -11917,13 +12120,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}''"
@@ -12066,10 +12269,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"
@@ -12084,22 +12287,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}''"
@@ -12168,8 +12370,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..."
@@ -12184,9 +12385,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}''"
@@ -12508,12 +12724,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12524,30 +12739,73 @@ 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 "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] ""
+
+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"
@@ -12558,9 +12816,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 +13155,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 ""
@@ -13122,6 +13399,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."
@@ -13171,9 +13451,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 ""
@@ -13210,6 +13487,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 ""
@@ -13340,6 +13622,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13430,6 +13715,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 ""
@@ -13448,10 +13777,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13463,6 +13792,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13490,18 +13822,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 ""
@@ -13511,9 +13837,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13523,13 +13846,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13577,6 +13900,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13661,6 +13987,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13765,21 +14094,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 ""
@@ -13795,10 +14133,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"
@@ -13834,7 +14172,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13903,12 +14241,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 ""
@@ -13924,15 +14268,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 ""
@@ -13954,6 +14289,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13963,6 +14307,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13972,10 +14319,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14008,9 +14352,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14053,6 +14394,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14068,6 +14415,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14137,19 +14487,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14180,6 +14524,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14189,10 +14534,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14246,12 +14591,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14312,12 +14651,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14357,9 +14705,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14393,6 +14738,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 ""
@@ -14474,18 +14834,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 ""
@@ -14561,7 +14926,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14585,10 +14950,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"
@@ -14600,9 +14968,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14654,6 +15019,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14666,18 +15034,32 @@ 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 ""
@@ -14777,11 +15159,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14793,11 +15173,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14816,10 +15194,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14849,9 +15227,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14873,10 +15248,29 @@ 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"
@@ -15026,6 +15420,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15047,6 +15444,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15074,6 +15477,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15098,22 +15507,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 ""
@@ -15135,9 +15528,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15332,6 +15722,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15362,6 +15755,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15374,9 +15770,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15386,9 +15779,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15401,6 +15799,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15425,14 +15826,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15481,7 +15874,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15535,41 +15928,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"
@@ -15761,9 +16154,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15785,9 +16175,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15800,6 +16196,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15839,6 +16238,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15860,22 +16262,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"
@@ -16005,49 +16419,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"
@@ -16065,6 +16473,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16077,6 +16491,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16095,37 +16512,137 @@ 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"
@@ -16215,6 +16732,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 ""
@@ -16296,12 +16819,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+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 ""
@@ -16311,6 +16888,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 ""
@@ -16320,31 +16921,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 ""
@@ -16372,7 +16979,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16399,21 +17006,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 "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16448,16 +17049,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16491,6 +17098,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16528,117 +17138,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 ""
@@ -16672,33 +17318,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 ""
@@ -16732,6 +17388,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 ""
@@ -16832,36 +17504,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 ""
@@ -16904,19 +17594,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 ""
@@ -17055,6 +17741,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 ""
@@ -17067,60 +17765,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 ""
@@ -17345,41 +18117,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"
@@ -17388,7 +18186,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17400,12 +18198,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 ""
@@ -17457,88 +18345,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 "battery charging"
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
msgstr ""
-msgid "Power Station"
+msgid "steam_turbine"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17550,6 +18541,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 ""
@@ -17565,6 +18571,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17583,11 +18592,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17696,10 +18703,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17711,7 +18718,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17732,6 +18739,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17744,9 +18754,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17816,7 +18823,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17837,13 +18844,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"
@@ -17852,7 +18859,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17880,6 +18886,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17916,10 +18928,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"
@@ -17949,7 +18982,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17961,19 +18994,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"
@@ -18009,7 +19042,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18222,6 +19255,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18261,24 +19300,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 ""
@@ -18288,15 +19336,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18372,6 +19411,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18426,7 +19471,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18438,6 +19483,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18474,43 +19522,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18549,6 +19624,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18717,21 +19804,50 @@ 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 ""
+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 ""
@@ -18777,19 +19893,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"
@@ -18813,7 +19932,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18909,18 +20028,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 ""
@@ -18930,7 +20058,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18939,10 +20070,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18960,6 +20091,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18975,28 +20109,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"
@@ -19017,19 +20151,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"
@@ -19104,10 +20238,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19122,9 +20259,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19152,6 +20286,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19197,10 +20334,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"
@@ -19212,7 +20379,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"
@@ -19230,7 +20397,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19347,19 +20514,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 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"
@@ -19378,7 +20656,46 @@ 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 "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 "Landsat"
@@ -19390,19 +20707,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 "skobbler heatmap"
@@ -19423,7 +20749,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19432,6 +20758,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19578,6 +20907,29 @@ 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 ""
@@ -19743,6 +21095,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19788,6 +21143,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19974,19 +21362,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20010,13 +21410,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20279,10 +21673,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20486,7 +21883,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"
@@ -20757,15 +22154,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20936,6 +22324,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 ""
@@ -20954,12 +22345,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21095,6 +22480,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 ""
@@ -21112,6 +22500,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 ""
@@ -21338,7 +22729,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."
@@ -21388,7 +22782,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21573,6 +22967,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21612,27 +23071,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 ""
@@ -22710,9 +24151,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 ""
@@ -23359,9 +24817,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23414,18 +24869,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 ""
@@ -23772,6 +25215,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23923,6 +25387,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 ""
@@ -24240,9 +25707,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24458,6 +25922,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 ""
@@ -24490,15 +25957,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 ""
@@ -24613,9 +26096,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24794,19 +26274,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"
@@ -25022,6 +26502,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 ""
@@ -25058,6 +26627,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..."
@@ -25210,9 +26782,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26197,9 +27766,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26478,9 +28044,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 a671f41..9cf2863 100644
--- a/i18n/po/ky.po
+++ b/i18n/po/ky.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-08-04 03:41+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2012-12-18 02:36+0000\n"
"Last-Translator: ballpen <Unknown>\n"
"Language-Team: Kirghiz <ky 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-08-05 04:49+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -58,6 +61,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -158,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 ""
@@ -249,9 +255,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -288,6 +291,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -342,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 ""
@@ -522,6 +528,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -635,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 ""
@@ -785,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"
@@ -971,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 ""
@@ -994,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>"
@@ -1162,9 +1164,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1303,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"
@@ -1398,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 ""
@@ -1682,6 +1702,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1901,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] ""
@@ -2327,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 ""
@@ -2523,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 ""
@@ -2610,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 ""
@@ -2646,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"
@@ -2672,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}''"
@@ -2777,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] ""
@@ -2837,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"
@@ -2868,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"
@@ -2892,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 ""
@@ -2922,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 ""
@@ -2942,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 ""
@@ -2951,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 ""
@@ -2971,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}"
@@ -3002,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}''."
@@ -3159,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 ""
@@ -3267,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 ""
@@ -3305,9 +3335,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3346,6 +3373,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3370,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 ""
@@ -3429,6 +3468,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3511,6 +3553,15 @@ 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 ""
@@ -3580,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 ""
@@ -3637,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})"
@@ -3675,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}"
@@ -3812,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"
@@ -3887,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 ""
@@ -3917,9 +3977,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3944,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''"
@@ -4010,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 ""
@@ -4130,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"
@@ -4359,6 +4399,18 @@ 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 ""
@@ -4463,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 ""
@@ -4763,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 "> 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"
@@ -4800,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"
@@ -4852,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 ""
@@ -5109,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 ""
@@ -5637,6 +5686,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5720,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 ""
@@ -5810,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 ""
@@ -5981,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 ""
@@ -6268,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"
@@ -6334,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"
@@ -6376,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)"
@@ -6536,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"
@@ -6854,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 ""
@@ -6985,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 ""
@@ -7009,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 ""
@@ -7122,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."
@@ -7221,6 +7300,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7308,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"
@@ -7327,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 ""
@@ -7393,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"
@@ -7469,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 ""
@@ -7484,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"
@@ -7700,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 "
@@ -7714,13 +7794,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7729,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 ""
@@ -7736,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 ..."
@@ -7849,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] ""
@@ -7861,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>"
@@ -7877,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:"
@@ -8023,7 +8134,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8053,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"
@@ -8406,9 +8517,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8427,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 ""
@@ -8484,6 +8595,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8550,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 ""
@@ -8733,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}''..."
@@ -8755,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"
@@ -8765,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:"
@@ -8986,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}''"
@@ -9701,6 +9810,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9769,6 +9911,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9822,6 +9967,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 ""
@@ -10278,6 +10428,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 ""
@@ -10341,7 +10497,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 ""
@@ -10599,40 +10755,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}''"
@@ -10685,8 +10841,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:"
@@ -10695,20 +10851,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 ""
@@ -10790,14 +10951,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"
@@ -10870,7 +11025,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10949,9 +11104,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10970,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 ""
@@ -10999,9 +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 ""
@@ -11032,7 +11232,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 ""
@@ -11072,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..."
@@ -11188,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 ""
@@ -11203,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}."
@@ -11287,7 +11496,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11386,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 ""
@@ -11424,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 ..."
@@ -11452,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>"
@@ -11539,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}."
@@ -11737,7 +11919,7 @@ 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}"
@@ -11783,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."
@@ -11813,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 ""
@@ -11847,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 ""
@@ -11921,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}''"
@@ -12070,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"
@@ -12088,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}''"
@@ -12172,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..."
@@ -12188,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}''"
@@ -12512,12 +12728,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12528,30 +12743,73 @@ 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 "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] ""
+
+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"
@@ -12562,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."
@@ -12887,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 ""
@@ -13126,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."
@@ -13175,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 ""
@@ -13214,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 ""
@@ -13344,6 +13626,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13434,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 ""
@@ -13452,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"
@@ -13467,6 +13796,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13494,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 ""
@@ -13515,9 +13841,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13527,13 +13850,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13581,6 +13904,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13665,6 +13991,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13769,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 ""
@@ -13799,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"
@@ -13838,7 +14176,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13907,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 ""
@@ -13928,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 ""
@@ -13958,6 +14293,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13967,6 +14311,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13976,10 +14323,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14012,9 +14356,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14057,6 +14398,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14072,6 +14419,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14141,19 +14491,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14184,6 +14528,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14193,10 +14538,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14250,12 +14595,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14316,12 +14655,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14361,9 +14709,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14397,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 ""
@@ -14478,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 ""
@@ -14565,7 +14930,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14589,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"
@@ -14604,9 +14972,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14658,6 +15023,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14670,6 +15038,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14781,11 +15184,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14797,11 +15198,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14820,10 +15219,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14853,9 +15252,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14877,10 +15273,29 @@ 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"
@@ -15030,6 +15445,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15051,6 +15469,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15078,6 +15502,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15102,22 +15532,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 ""
@@ -15139,9 +15553,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15336,6 +15747,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15366,6 +15780,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15378,9 +15795,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15390,9 +15804,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15405,6 +15824,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15429,14 +15851,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15485,7 +15899,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15539,41 +15953,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"
@@ -15765,9 +16179,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15789,9 +16200,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15804,6 +16221,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15843,6 +16263,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15864,22 +16287,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"
@@ -16009,49 +16444,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"
@@ -16069,6 +16498,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16081,6 +16516,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16099,37 +16537,137 @@ 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"
@@ -16219,6 +16757,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 ""
@@ -16300,128 +16844,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16452,16 +17074,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16495,6 +17123,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16532,117 +17163,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 ""
@@ -16676,33 +17343,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 ""
@@ -16736,6 +17413,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 ""
@@ -16836,36 +17529,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 ""
@@ -16908,19 +17619,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 ""
@@ -17059,6 +17766,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 ""
@@ -17071,60 +17790,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 ""
@@ -17349,41 +18142,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"
@@ -17392,7 +18211,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17404,12 +18223,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 ""
@@ -17461,88 +18370,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17554,6 +18566,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 ""
@@ -17569,6 +18596,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17587,11 +18617,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17700,10 +18728,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17715,7 +18743,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17736,6 +18764,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17748,9 +18779,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17820,7 +18848,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17841,13 +18869,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"
@@ -17856,7 +18884,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17884,6 +18911,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17920,10 +18953,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"
@@ -17953,7 +19007,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17965,19 +19019,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"
@@ -18013,7 +19067,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18226,6 +19280,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18265,24 +19325,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 ""
@@ -18292,15 +19361,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18376,6 +19436,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18430,7 +19496,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18442,6 +19508,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18478,43 +19547,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18553,6 +19649,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18721,21 +19829,50 @@ 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 ""
+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 ""
@@ -18781,19 +19918,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"
@@ -18817,7 +19957,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18913,18 +20053,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 ""
@@ -18934,7 +20083,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18943,10 +20095,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18964,6 +20116,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18979,28 +20134,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"
@@ -19021,19 +20176,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"
@@ -19108,10 +20263,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19126,9 +20284,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19156,6 +20311,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19201,10 +20359,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"
@@ -19216,7 +20404,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"
@@ -19234,7 +20422,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19351,19 +20539,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 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"
@@ -19382,7 +20681,46 @@ 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 "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 "Landsat"
@@ -19394,19 +20732,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 "skobbler heatmap"
@@ -19427,7 +20774,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19436,6 +20783,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19582,6 +20932,29 @@ 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 ""
@@ -19747,6 +21120,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19792,6 +21168,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19978,19 +21387,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20014,13 +21435,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20283,10 +21698,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20490,7 +21908,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"
@@ -20761,15 +22179,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20940,6 +22349,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 ""
@@ -20958,12 +22370,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21099,6 +22505,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 ""
@@ -21116,6 +22525,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 ""
@@ -21342,7 +22754,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."
@@ -21392,7 +22807,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21577,6 +22992,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21616,27 +23096,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 ""
@@ -22714,9 +24176,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 ""
@@ -23363,9 +24842,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23418,18 +24894,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 ""
@@ -23776,6 +25240,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23927,6 +25412,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 ""
@@ -24244,9 +25732,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24462,6 +25947,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 ""
@@ -24494,15 +25982,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 ""
@@ -24617,9 +26121,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24798,19 +26299,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"
@@ -25026,6 +26527,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 ""
@@ -25062,6 +26652,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..."
@@ -25214,9 +26807,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26202,9 +27792,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26483,9 +28070,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 e36b470..534e4b6 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-08-04 03:41+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-08-05 04:50+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 "
@@ -252,9 +256,6 @@ msgstr "ອຸປະກອນ:{0}"
msgid "Please select at least four nodes."
msgstr "ກະລຸນາເລືອກ4ຂໍ້ເປັນຢ່າງຕ່ຳ"
-msgid "Information"
-msgstr "ຂໍ້ມູນ"
-
msgid "Align Nodes in Line"
msgstr "ຈັດແຖວເປັນເສັ້ນ"
@@ -291,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr "ຂໍ້ມູນ"
+
msgid "Zoom to {0}"
msgstr ""
@@ -345,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 ""
@@ -525,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -638,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 ""
@@ -788,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"
@@ -974,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 ""
@@ -997,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>"
@@ -1165,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1306,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"
@@ -1401,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 ""
@@ -1685,6 +1703,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1904,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] ""
@@ -2330,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 ""
@@ -2526,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 ""
@@ -2613,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 ""
@@ -2649,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"
@@ -2675,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}''"
@@ -2780,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] ""
@@ -2840,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"
@@ -2871,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"
@@ -2895,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 ""
@@ -2925,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 ""
@@ -2945,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 ""
@@ -2954,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 ""
@@ -2974,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}"
@@ -3005,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}''."
@@ -3162,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 ""
@@ -3270,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 ""
@@ -3308,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3349,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3373,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 ""
@@ -3432,6 +3469,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3514,6 +3554,15 @@ 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 ""
@@ -3583,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 ""
@@ -3640,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})"
@@ -3678,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}"
@@ -3815,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"
@@ -3890,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 ""
@@ -3920,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3947,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''"
@@ -4013,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 ""
@@ -4133,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"
@@ -4362,6 +4400,18 @@ 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 ""
@@ -4466,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 ""
@@ -4766,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"
@@ -4803,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"
@@ -4855,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 ""
@@ -5112,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 ""
@@ -5640,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5723,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 ""
@@ -5813,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 ""
@@ -5984,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 ""
@@ -6271,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"
@@ -6337,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"
@@ -6379,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)"
@@ -6539,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"
@@ -6857,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 ""
@@ -6988,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 ""
@@ -7012,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 ""
@@ -7125,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."
@@ -7224,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7311,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"
@@ -7330,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 ""
@@ -7396,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"
@@ -7472,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 ""
@@ -7487,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"
@@ -7703,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 "
@@ -7717,13 +7795,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7732,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 ""
@@ -7739,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 ..."
@@ -7852,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] ""
@@ -7864,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>"
@@ -7880,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:"
@@ -8026,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8056,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"
@@ -8409,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8430,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 ""
@@ -8487,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8553,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 ""
@@ -8736,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}''..."
@@ -8758,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"
@@ -8768,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:"
@@ -8989,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}''"
@@ -9704,6 +9811,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9772,6 +9912,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9825,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 ""
@@ -10281,6 +10429,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 ""
@@ -10344,7 +10498,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 ""
@@ -10602,40 +10756,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}''"
@@ -10688,8 +10842,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:"
@@ -10698,20 +10852,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 ""
@@ -10793,14 +10952,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"
@@ -10873,7 +11026,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10952,9 +11105,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10973,6 +11123,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 ""
@@ -11002,9 +11160,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 ""
@@ -11035,7 +11233,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 ""
@@ -11075,28 +11273,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..."
@@ -11191,6 +11387,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11206,12 +11405,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}."
@@ -11290,7 +11497,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11389,35 +11596,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 ""
@@ -11427,8 +11610,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 ..."
@@ -11455,10 +11638,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>"
@@ -11542,8 +11722,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}."
@@ -11740,7 +11920,7 @@ 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}"
@@ -11786,6 +11966,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."
@@ -11816,19 +12005,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 ""
@@ -11850,11 +12039,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 ""
@@ -11924,13 +12125,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}''"
@@ -12073,10 +12274,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"
@@ -12091,22 +12292,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}''"
@@ -12175,8 +12375,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..."
@@ -12191,9 +12390,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}''"
@@ -12515,12 +12729,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12531,30 +12744,73 @@ 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 "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] ""
+
+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"
@@ -12565,9 +12821,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."
@@ -12890,6 +13160,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 ""
@@ -13129,6 +13404,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."
@@ -13178,9 +13456,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 ""
@@ -13217,6 +13492,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 ""
@@ -13347,6 +13627,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13437,6 +13720,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 ""
@@ -13455,10 +13782,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13470,6 +13797,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13497,18 +13827,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 ""
@@ -13518,9 +13842,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13530,13 +13851,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13584,6 +13905,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13668,6 +13992,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13772,21 +14099,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 ""
@@ -13802,10 +14138,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"
@@ -13841,7 +14177,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13910,12 +14246,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 ""
@@ -13931,15 +14273,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 ""
@@ -13961,6 +14294,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13970,6 +14312,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13979,10 +14324,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14015,9 +14357,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14060,6 +14399,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14075,6 +14420,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14144,19 +14492,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14187,6 +14529,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14196,10 +14539,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14253,12 +14596,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14319,12 +14656,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14364,9 +14710,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14400,6 +14743,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 ""
@@ -14481,18 +14839,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 ""
@@ -14568,7 +14931,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14592,10 +14955,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"
@@ -14607,9 +14973,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14661,6 +15024,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14673,6 +15039,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14784,11 +15185,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14800,11 +15199,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14823,10 +15220,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14856,9 +15253,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14880,10 +15274,29 @@ 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"
@@ -15033,6 +15446,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15054,6 +15470,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15081,6 +15503,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15105,22 +15533,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 ""
@@ -15142,9 +15554,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15339,6 +15748,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15369,6 +15781,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15381,9 +15796,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15393,9 +15805,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15408,6 +15825,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15432,14 +15852,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15488,7 +15900,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15542,41 +15954,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"
@@ -15768,9 +16180,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15792,9 +16201,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15807,6 +16222,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15846,6 +16264,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15867,22 +16288,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"
@@ -16012,49 +16445,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"
@@ -16072,6 +16499,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16084,6 +16517,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16102,37 +16538,137 @@ 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"
@@ -16222,6 +16758,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 ""
@@ -16303,128 +16845,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16455,16 +17075,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16498,6 +17124,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16535,117 +17164,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 ""
@@ -16679,33 +17344,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 ""
@@ -16739,6 +17414,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 ""
@@ -16839,36 +17530,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 ""
@@ -16911,19 +17620,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 ""
@@ -17062,6 +17767,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 ""
@@ -17074,60 +17791,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 ""
@@ -17352,41 +18143,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"
@@ -17395,7 +18212,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17407,12 +18224,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 ""
@@ -17464,88 +18371,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17557,6 +18567,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 ""
@@ -17572,6 +18597,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17590,11 +18618,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17703,10 +18729,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17718,7 +18744,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17739,6 +18765,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17751,9 +18780,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17823,7 +18849,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17844,13 +18870,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"
@@ -17859,7 +18885,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17887,6 +18912,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17923,10 +18954,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"
@@ -17956,7 +19008,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17968,19 +19020,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"
@@ -18016,7 +19068,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18229,6 +19281,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18268,24 +19326,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 ""
@@ -18295,15 +19362,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18379,6 +19437,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18433,7 +19497,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18445,6 +19509,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18481,43 +19548,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18556,6 +19650,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18724,21 +19830,50 @@ 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 ""
+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 ""
@@ -18784,19 +19919,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"
@@ -18820,7 +19958,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18916,18 +20054,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 ""
@@ -18937,7 +20084,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18946,10 +20096,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18967,6 +20117,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18982,28 +20135,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"
@@ -19024,19 +20177,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"
@@ -19111,10 +20264,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19129,9 +20285,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19159,6 +20312,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19204,10 +20360,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"
@@ -19219,7 +20405,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"
@@ -19237,7 +20423,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19354,19 +20540,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 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"
@@ -19385,7 +20682,46 @@ 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 "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 "Landsat"
@@ -19397,19 +20733,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 "skobbler heatmap"
@@ -19430,7 +20775,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19439,6 +20784,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19585,6 +20933,29 @@ 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 ""
@@ -19750,6 +21121,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19795,6 +21169,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19981,19 +21388,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20017,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}''."
@@ -20286,10 +21699,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20493,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"
@@ -20764,15 +22180,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20943,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 ""
@@ -20961,12 +22371,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21102,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 ""
@@ -21119,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 ""
@@ -21345,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."
@@ -21395,7 +22808,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21580,6 +22993,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21619,27 +23097,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 ""
@@ -22717,9 +24177,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 ""
@@ -23366,9 +24843,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23421,18 +24895,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 ""
@@ -23779,6 +25241,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23930,6 +25413,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 ""
@@ -24247,9 +25733,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24465,6 +25948,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 ""
@@ -24497,15 +25983,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 ""
@@ -24620,9 +26122,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24801,19 +26300,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"
@@ -25029,6 +26528,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 ""
@@ -25065,6 +26653,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..."
@@ -25217,9 +26808,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26205,9 +27793,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26486,9 +28071,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 2f5086e..e4b6844 100644
--- a/i18n/po/lt.po
+++ b/i18n/po/lt.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-04 03:41+0200\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"
@@ -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-08-05 04:51+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ 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 ""
@@ -60,6 +63,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Vykdomas platformos paleidimas"
@@ -163,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 ""
@@ -255,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ę"
@@ -294,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}"
@@ -350,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"
@@ -532,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)"
@@ -645,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 ""
@@ -795,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"
@@ -982,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 ""
@@ -1005,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>"
@@ -1175,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ą"
@@ -1330,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"
@@ -1433,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"
@@ -1717,6 +1737,9 @@ 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)"
@@ -1937,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] ""
@@ -2364,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 ""
@@ -2560,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 ""
@@ -2647,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 ""
@@ -2683,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"
@@ -2709,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}''"
@@ -2814,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] ""
@@ -2874,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"
@@ -2905,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"
@@ -2929,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 ""
@@ -2959,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 ""
@@ -2979,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 ""
@@ -2988,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 ""
@@ -3008,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}"
@@ -3039,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}''."
@@ -3199,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 ""
@@ -3307,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 ""
@@ -3345,9 +3375,6 @@ msgstr ""
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr "WGS84"
@@ -3386,6 +3413,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3410,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 ""
@@ -3469,6 +3508,9 @@ msgstr " arba "
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3551,6 +3593,15 @@ 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 ""
@@ -3620,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 ""
@@ -3677,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 ""
@@ -3715,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}"
@@ -3852,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"
@@ -3927,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 ""
@@ -3957,9 +4017,6 @@ msgstr "pastatas"
msgid "area"
msgstr "plotas"
-msgid "Unclosed way"
-msgstr "Atviras kelias"
-
msgid "Unconnected ways"
msgstr "Nesujungti keliai"
@@ -3984,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 ""
@@ -4050,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 ""
@@ -4171,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"
@@ -4400,6 +4440,18 @@ 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"
@@ -4504,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 ""
@@ -4804,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"
@@ -4841,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"
@@ -4893,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"
@@ -5150,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 ""
@@ -5678,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"
@@ -5761,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"
@@ -5851,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 ""
@@ -6023,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ą"
@@ -6310,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"
@@ -6376,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"
@@ -6418,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)"
@@ -6578,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"
@@ -6896,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"
@@ -7027,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, "
@@ -7051,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 ""
@@ -7164,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."
@@ -7263,6 +7342,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7350,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"
@@ -7369,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:"
@@ -7435,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"
@@ -7511,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 ""
@@ -7526,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"
@@ -7742,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 "
@@ -7756,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 ""
@@ -7771,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 ""
@@ -7778,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 ..."
@@ -7891,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] ""
@@ -7903,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>"
@@ -7919,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:"
@@ -8065,7 +8176,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8095,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"
@@ -8450,9 +8561,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8471,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 ""
@@ -8528,6 +8639,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8594,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 ""
@@ -8777,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}''..."
@@ -8799,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"
@@ -8809,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:"
@@ -9030,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}''"
@@ -9745,6 +9854,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9813,6 +9955,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9866,6 +10011,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 ""
@@ -10322,6 +10472,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 ""
@@ -10385,7 +10541,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 ""
@@ -10643,21 +10799,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 ""
@@ -10679,6 +10820,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 ""
@@ -10729,8 +10885,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:"
@@ -10739,20 +10895,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 "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 ""
@@ -10834,14 +10995,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"
@@ -10914,7 +11069,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10993,9 +11148,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -11014,6 +11166,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 ""
@@ -11043,9 +11203,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 ""
@@ -11076,7 +11276,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 ""
@@ -11116,28 +11316,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..."
@@ -11233,6 +11431,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11248,12 +11449,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}."
@@ -11332,8 +11541,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 ""
@@ -11431,35 +11640,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 ""
@@ -11469,8 +11654,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 ..."
@@ -11497,10 +11682,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>"
@@ -11584,8 +11766,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}."
@@ -11782,7 +11964,7 @@ 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}"
@@ -11828,6 +12010,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."
@@ -11858,19 +12049,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 ""
@@ -11892,11 +12083,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 ""
@@ -11966,13 +12169,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}''"
@@ -12115,10 +12318,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"
@@ -12133,22 +12336,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}''"
@@ -12217,8 +12419,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..."
@@ -12233,9 +12434,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}''"
@@ -12557,12 +12773,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12573,15 +12788,58 @@ 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] ""
+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 ""
+
+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):"
@@ -12607,9 +12865,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."
@@ -12932,6 +13204,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 ""
@@ -13171,6 +13448,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."
@@ -13220,9 +13500,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 ""
@@ -13259,6 +13536,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 ""
@@ -13389,6 +13671,9 @@ msgstr "Pylimas"
msgid "Lit"
msgstr "Apšviesta"
+msgid "Toll"
+msgstr "Mokestis"
+
msgid "Motorway Link"
msgstr "Automagistralė/Greitkelio Rampa"
@@ -13479,6 +13764,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 ""
@@ -13497,10 +13826,10 @@ msgstr "Sritis"
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13512,6 +13841,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13539,18 +13871,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 ""
@@ -13560,9 +13886,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13572,15 +13895,15 @@ msgstr ""
msgid "private"
msgstr "privatus"
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr ""
msgid "forestry"
msgstr ""
-msgid "no"
-msgstr "ne"
-
msgid "official"
msgstr ""
@@ -13626,6 +13949,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Ribotas Mažiausias greitis (km/h)"
@@ -13710,6 +14036,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13814,20 +14143,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"
@@ -13844,10 +14182,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"
@@ -13883,7 +14221,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13952,12 +14290,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 ""
@@ -13973,15 +14317,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 ""
@@ -14003,6 +14338,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -14012,6 +14356,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -14021,10 +14368,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"
@@ -14057,9 +14401,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14099,9 +14440,21 @@ msgstr ""
msgid "Edit Block"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
msgstr ""
+msgid "Material"
+msgstr "Medžiaga"
+
+msgid "stone"
+msgstr "akmuo"
+
msgid "Bollard"
msgstr ""
@@ -14117,6 +14470,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr "plastmasė"
+
msgid "Cycle Barrier"
msgstr ""
@@ -14186,21 +14542,18 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
-msgstr ""
+msgid "pole"
+msgstr "stulpas"
-msgid "split_rail"
+msgid "Guard Rail"
msgstr ""
-msgid "chain"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "hedge"
+msgid "wire"
msgstr ""
-msgid "pole"
-msgstr "stulpas"
-
msgid "Guard Rail"
msgstr ""
@@ -14229,6 +14582,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14238,11 +14592,11 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
-msgstr "Įėjimas"
+msgid "Entrance (barrier opening)"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Keisti Įėjimą"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Vartai"
@@ -14295,12 +14649,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr "Medžiaga"
-
-msgid "stone"
-msgstr "akmuo"
-
msgid "Turnstile"
msgstr ""
@@ -14361,12 +14709,21 @@ msgstr ""
msgid "Ditch"
msgstr "Griovys"
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr "Upelis"
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Kanalas"
@@ -14406,9 +14763,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14442,6 +14796,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"
@@ -14523,18 +14892,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 ""
@@ -14610,7 +14984,7 @@ msgstr "turistinis"
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14634,11 +15008,14 @@ msgstr ""
msgid "rail"
msgstr "bėgiai"
-msgid "Voltage"
-msgstr "Įtampa"
+msgid "Voltage in Volts (V)"
+msgstr ""
-msgid "Frequency (Hz)"
-msgstr "Dažnis (Hz)"
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
+
+msgid "16.67"
+msgstr ""
msgid "16.7"
msgstr "16.7"
@@ -14649,9 +15026,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14703,6 +15077,9 @@ msgstr ""
msgid "Level Crossing"
msgstr "Pervaža"
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14715,18 +15092,32 @@ 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 ""
@@ -14826,11 +15217,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14842,11 +15231,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14865,10 +15252,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
-msgstr ""
+msgid "rooftop"
+msgstr "ant stogo"
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14898,9 +15285,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr "ant stogo"
-
msgid "Capacity"
msgstr "Vietų skaičius"
@@ -14922,20 +15306,39 @@ msgstr "Darbo valandos"
msgid "24/7"
msgstr "24/7"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Mo-Fr 08: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 "08:30-12:30,15:30-20:00"
+msgstr ""
-msgid "Parking entrance"
-msgstr "Stovėjimo aikštelės įvažiavimas"
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
-msgid "Edit Parking entrance"
-msgstr "Keisti Stovėjimo aikštelės įvažiavimą"
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
-msgid "Fuel"
-msgstr "Degalinė"
+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 "Stovėjimo aikštelės įvažiavimas"
+
+msgid "Edit Parking entrance"
+msgstr "Keisti Stovėjimo aikštelės įvažiavimą"
+
+msgid "Fuel"
+msgstr "Degalinė"
msgid "Edit Fuel"
msgstr "Keisti Degalinę"
@@ -15075,6 +15478,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr "Įtampa"
+
msgid "Amperage"
msgstr "Srovė"
@@ -15096,6 +15502,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr "Dalys"
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15123,6 +15535,12 @@ msgstr "Nuoma"
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15147,22 +15565,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 ""
@@ -15184,9 +15586,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Dalys"
-
msgid "Clothes"
msgstr "Drabužiai"
@@ -15381,6 +15780,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15411,6 +15813,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Suolelis"
@@ -15423,9 +15828,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15435,7 +15837,12 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
+msgstr "Stotis"
+
+msgctxt "railway"
+msgid "Edit Station"
msgstr ""
msgid "Building"
@@ -15450,6 +15857,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15474,14 +15884,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr "Stotis"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15530,7 +15932,7 @@ msgstr ""
msgid "Taxi"
msgstr "Taxi"
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15584,6 +15986,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"
@@ -15606,21 +16023,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"
@@ -15810,9 +16212,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15834,9 +16233,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 ""
@@ -15849,6 +16254,9 @@ msgstr "gatvė"
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15888,6 +16296,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15909,22 +16320,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"
@@ -16054,49 +16477,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"
@@ -16114,6 +16531,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16126,6 +16549,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16144,38 +16570,138 @@ 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"
@@ -16264,6 +16790,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 ""
@@ -16345,14 +16877,68 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
-msgstr "Telefonas"
+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"
msgid "Edit Telephone"
msgstr ""
@@ -16360,6 +16946,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"
@@ -16369,31 +16979,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 ""
@@ -16421,7 +17037,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16448,21 +17064,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 "plastic"
-msgstr "plastmasė"
-
msgid "Amount of Seats"
msgstr ""
@@ -16497,18 +17107,24 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
+
msgid "Hide"
msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
-msgstr "Geriamas Vanduo"
-
msgid "Edit Source of Potable Water"
msgstr ""
@@ -16540,6 +17156,9 @@ msgstr "baseinas"
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16577,119 +17196,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"
@@ -16721,26 +17376,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 ""
@@ -16748,6 +17404,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "aikštelė"
+
+msgid "sports_centre"
+msgstr "sporto_centras"
+
+msgid "stadium"
+msgstr "stadionas"
+
msgid "10pin"
msgstr ""
@@ -16781,6 +17446,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 ""
@@ -16881,36 +17562,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 ""
@@ -16953,19 +17652,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 ""
@@ -17104,6 +17799,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"
@@ -17116,38 +17823,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"
@@ -17155,21 +17897,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"
@@ -17394,41 +18175,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"
@@ -17437,7 +18244,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17449,12 +18256,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "parduotuvė"
+
+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 "karštas vanduo"
+
+msgid "hot air"
+msgstr "karštas oras"
+
+msgid "cold water"
+msgstr "šaltas vanduo"
+
+msgid "cold air"
+msgstr "šaltas oras"
+
+msgid "compressed air"
+msgstr "suslėgtas oras"
+
+msgid "steam"
+msgstr "grai"
+
+msgid "vacuum"
+msgstr "vakuumas"
+
msgid "Power Generator"
msgstr ""
@@ -17506,88 +18403,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"
-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 "karštas vanduo"
+msgid "gas_turbine"
+msgstr ""
-msgid "hot air"
-msgstr "karštas oras"
+msgid "biogas, biomass, gas, waste combustion"
+msgstr ""
-msgid "cold water"
-msgstr "šaltas vanduo"
+msgid "heat_pump"
+msgstr ""
-msgid "cold air"
-msgstr "šaltas oras"
+msgid "horizontal_axis"
+msgstr ""
-msgid "compressed air"
-msgstr "suslėgtas oras"
+msgid "tidal steam / wind"
+msgstr ""
-msgid "steam"
-msgstr "grai"
+msgid "kaplan_turbine"
+msgstr ""
-msgid "vacuum"
-msgstr "vakuumas"
+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"
@@ -17599,6 +18599,21 @@ 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 ""
@@ -17614,6 +18629,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17632,11 +18650,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17745,11 +18761,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"
@@ -17760,8 +18776,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 ""
@@ -17781,6 +18797,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17793,9 +18812,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17865,7 +18881,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17886,13 +18902,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"
@@ -17901,9 +18917,8 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
-msgstr ""
+msgstr "Video"
msgid "Edit Video Shop"
msgstr ""
@@ -17929,6 +18944,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17965,10 +18986,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"
@@ -17998,7 +19040,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18010,19 +19052,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"
@@ -18058,7 +19100,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18271,6 +19313,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18310,24 +19358,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 ""
@@ -18337,15 +19394,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18421,6 +19469,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18475,7 +19529,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18487,6 +19541,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18532,34 +19589,61 @@ msgstr ""
msgid "Construction area"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr "Savartynas"
+
+msgid "Edit Landfill Landuse"
+msgstr ""
+
+msgid "Quarry"
+msgstr ""
+
+msgid "Edit Quarry Landuse"
+msgstr ""
+
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
-msgstr "Savartynas"
+msgid "Regional name"
+msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18598,6 +19682,18 @@ msgstr "lyginis"
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18766,21 +19862,50 @@ 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 "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 ""
@@ -18826,21 +19951,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 ""
@@ -18862,7 +19990,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18958,18 +20086,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"
@@ -18979,7 +20116,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18988,10 +20128,10 @@ msgstr ""
msgid "ford"
msgstr "brasta"
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -19009,6 +20149,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19024,28 +20167,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"
@@ -19066,20 +20209,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"
@@ -19153,11 +20296,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"
@@ -19171,9 +20317,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19201,6 +20344,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19246,10 +20392,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"
@@ -19261,7 +20437,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"
@@ -19279,7 +20455,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19396,19 +20572,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 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"
@@ -19427,7 +20714,46 @@ 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 "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 "Landsat"
@@ -19439,19 +20765,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 "skobbler heatmap"
@@ -19472,7 +20807,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19481,6 +20816,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19627,6 +20965,29 @@ 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 ""
@@ -19792,6 +21153,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19837,6 +21201,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -20023,19 +21420,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20059,13 +21468,7 @@ msgstr ""
msgid "Time"
msgstr "Laikas"
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20330,10 +21733,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20537,7 +21943,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"
@@ -20808,15 +22214,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"
@@ -20987,6 +22384,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 ""
@@ -21005,12 +22405,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "aukštis"
-
-msgid "medium"
-msgstr "vidutinis"
-
msgid "symbol"
msgstr "simbolis"
@@ -21146,6 +22540,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 ""
@@ -21163,6 +22560,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 ""
@@ -21389,7 +22789,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."
@@ -21439,8 +22842,8 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
-msgstr "Adresas"
+msgid "Address"
+msgstr ""
msgid "Split area"
msgstr ""
@@ -21624,6 +23027,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21663,27 +23131,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 ""
@@ -22761,9 +24211,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 ""
@@ -23410,9 +24877,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23465,18 +24929,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 ""
@@ -23823,6 +25275,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23974,6 +25447,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 ""
@@ -24291,9 +25767,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24509,6 +25982,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 ""
@@ -24541,15 +26017,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 ""
@@ -24664,9 +26156,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr "Greitkelio tipas"
-
msgid "Speed (Km/h)"
msgstr "Greitis (Km/h)"
@@ -24845,19 +26334,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"
@@ -25073,6 +26562,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"
@@ -25109,6 +26687,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..."
@@ -25261,9 +26842,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26253,9 +27831,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr "Video"
-
msgid "Import Video"
msgstr "Įkelti Video"
@@ -26534,9 +28109,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 8f23229..f5c7c35 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-08-04 03:41+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-08-05 04:50+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -163,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 "
@@ -261,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"
@@ -300,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}"
@@ -356,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"
@@ -537,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 ""
@@ -656,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 ""
@@ -806,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"
@@ -992,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 ""
@@ -1015,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>"
@@ -1183,9 +1181,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1324,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"
@@ -1419,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"
@@ -1703,6 +1719,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1922,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] ""
@@ -2348,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 ""
@@ -2544,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 ""
@@ -2631,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 ""
@@ -2667,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"
@@ -2693,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}''"
@@ -2798,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] ""
@@ -2858,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"
@@ -2889,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"
@@ -2913,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 ""
@@ -2943,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 ""
@@ -2963,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 ""
@@ -2972,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 ""
@@ -2992,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}"
@@ -3023,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}''."
@@ -3180,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 ""
@@ -3288,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 ""
@@ -3326,9 +3352,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3367,6 +3390,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3391,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 ""
@@ -3450,6 +3485,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3532,6 +3570,15 @@ 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 ""
@@ -3601,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 ""
@@ -3658,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})"
@@ -3696,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}"
@@ -3833,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"
@@ -3908,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 ""
@@ -3938,9 +3994,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3965,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''"
@@ -4031,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 ""
@@ -4151,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"
@@ -4380,6 +4416,18 @@ 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 ""
@@ -4484,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 ""
@@ -4784,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"
@@ -4821,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"
@@ -4873,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 ""
@@ -5130,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 ""
@@ -5658,6 +5703,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5741,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 ""
@@ -5831,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 ""
@@ -6002,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 ""
@@ -6289,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"
@@ -6355,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 "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"
@@ -6397,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)"
@@ -6557,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"
@@ -6875,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 ""
@@ -7006,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, "
@@ -7030,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 ""
@@ -7143,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."
@@ -7242,6 +7317,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7329,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"
@@ -7348,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 ""
@@ -7414,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"
@@ -7490,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 ""
@@ -7505,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"
@@ -7721,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 "
@@ -7735,10 +7811,26 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 ""
+
+msgid "Cancel and return to the previous dialog"
msgstr ""
msgid "Do not show this message again"
@@ -7750,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 ""
@@ -7757,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 ..."
@@ -7870,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] ""
@@ -7882,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>"
@@ -7898,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:"
@@ -8044,7 +8151,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8074,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"
@@ -8427,9 +8534,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8448,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 ""
@@ -8505,6 +8612,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8571,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 ""
@@ -8754,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}''..."
@@ -8776,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"
@@ -8786,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:"
@@ -9007,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}''"
@@ -9722,6 +9827,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9790,6 +9928,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9843,6 +9984,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 ""
@@ -10299,6 +10445,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 ""
@@ -10362,7 +10514,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 ""
@@ -10620,40 +10772,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}''"
@@ -10706,8 +10858,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:"
@@ -10716,20 +10868,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 ""
@@ -10811,14 +10968,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"
@@ -10891,7 +11042,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10970,9 +11121,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10991,6 +11139,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 ""
@@ -11020,9 +11176,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 ""
@@ -11053,7 +11249,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 ""
@@ -11093,28 +11289,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..."
@@ -11213,6 +11407,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11228,12 +11425,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}."
@@ -11312,7 +11517,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11411,35 +11616,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 ""
@@ -11449,8 +11630,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 ..."
@@ -11477,10 +11658,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>"
@@ -11564,8 +11742,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}."
@@ -11762,7 +11940,7 @@ 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}"
@@ -11808,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."
@@ -11838,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 ""
@@ -11872,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 ""
@@ -11946,13 +12145,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}''"
@@ -12095,10 +12294,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"
@@ -12113,22 +12312,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}''"
@@ -12197,8 +12395,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..."
@@ -12213,9 +12410,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}''"
@@ -12537,12 +12749,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12553,27 +12764,70 @@ 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 "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] ""
+
+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"
@@ -12587,9 +12841,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."
@@ -12912,6 +13180,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 ""
@@ -13151,6 +13424,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."
@@ -13200,9 +13476,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 ""
@@ -13239,6 +13512,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 ""
@@ -13369,6 +13647,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13459,6 +13740,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 ""
@@ -13477,10 +13802,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13492,6 +13817,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13519,18 +13847,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 ""
@@ -13540,9 +13862,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13552,13 +13871,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13606,6 +13925,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13690,6 +14012,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13794,21 +14119,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 ""
@@ -13824,10 +14158,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"
@@ -13863,7 +14197,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13932,12 +14266,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 ""
@@ -13953,15 +14293,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 ""
@@ -13983,6 +14314,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13992,6 +14332,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -14001,10 +14344,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14037,9 +14377,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14082,6 +14419,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14097,6 +14440,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14166,19 +14512,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14209,6 +14549,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14218,10 +14559,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14275,12 +14616,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14341,12 +14676,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14386,9 +14730,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14422,6 +14763,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 ""
@@ -14503,18 +14859,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 ""
@@ -14590,7 +14951,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14614,10 +14975,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"
@@ -14629,9 +14993,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14683,6 +15044,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14695,6 +15059,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14806,11 +15205,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14822,11 +15219,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14845,10 +15240,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14878,9 +15273,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14902,10 +15294,29 @@ 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"
@@ -15055,6 +15466,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15076,7 +15490,13 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
-msgid "Tyres"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
+msgid "Tyres"
msgstr ""
msgid "Edit Tyres"
@@ -15103,6 +15523,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15127,22 +15553,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 ""
@@ -15164,9 +15574,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15361,6 +15768,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15391,6 +15801,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15403,9 +15816,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15415,9 +15825,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15430,6 +15845,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15454,14 +15872,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15510,7 +15920,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15564,41 +15974,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"
@@ -15790,9 +16200,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15814,9 +16221,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15829,6 +16242,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15868,6 +16284,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15889,22 +16308,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"
@@ -16034,49 +16465,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"
@@ -16094,6 +16519,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16106,6 +16537,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16124,37 +16558,137 @@ 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"
@@ -16244,6 +16778,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 ""
@@ -16325,125 +16865,203 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
msgstr ""
msgid "Edit Shelter"
@@ -16477,16 +17095,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16520,6 +17144,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16557,117 +17184,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 ""
@@ -16701,33 +17364,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 ""
@@ -16761,6 +17434,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 ""
@@ -16861,36 +17550,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 ""
@@ -16933,19 +17640,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 ""
@@ -17084,6 +17787,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 ""
@@ -17096,60 +17811,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 ""
@@ -17374,41 +18163,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"
@@ -17417,7 +18232,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17429,12 +18244,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 ""
@@ -17486,88 +18391,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17579,6 +18587,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 ""
@@ -17594,6 +18617,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17612,11 +18638,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17725,10 +18749,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17740,7 +18764,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17761,6 +18785,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17773,9 +18800,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17845,7 +18869,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17866,13 +18890,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"
@@ -17881,7 +18905,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17909,6 +18932,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17945,10 +18974,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"
@@ -17978,7 +19028,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17990,19 +19040,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"
@@ -18038,7 +19088,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18251,6 +19301,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18290,24 +19346,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 ""
@@ -18317,15 +19382,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18401,6 +19457,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18455,7 +19517,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18467,6 +19529,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18503,43 +19568,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18578,6 +19670,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18746,21 +19850,50 @@ 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 ""
+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 ""
@@ -18806,19 +19939,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"
@@ -18842,7 +19978,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18938,18 +20074,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 ""
@@ -18959,7 +20104,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18968,10 +20116,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18989,6 +20137,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19004,28 +20155,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"
@@ -19046,19 +20197,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"
@@ -19133,10 +20284,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19151,9 +20305,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19181,6 +20332,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19226,10 +20380,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"
@@ -19241,7 +20425,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"
@@ -19259,7 +20443,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19376,19 +20560,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 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"
@@ -19407,7 +20702,46 @@ 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 "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 "Landsat"
@@ -19419,19 +20753,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 "skobbler heatmap"
@@ -19452,7 +20795,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19461,6 +20804,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19607,6 +20953,29 @@ 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 ""
@@ -19772,6 +21141,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19817,6 +21189,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -20003,19 +21408,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20039,13 +21456,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20308,10 +21719,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20515,7 +21929,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"
@@ -20786,15 +22200,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20965,6 +22370,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 ""
@@ -20983,12 +22391,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21124,6 +22526,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 ""
@@ -21141,6 +22546,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 ""
@@ -21367,7 +22775,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."
@@ -21417,7 +22828,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21602,6 +23013,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21641,27 +23117,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 ""
@@ -22739,9 +24197,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 ""
@@ -23388,9 +24863,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23443,18 +24915,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 ""
@@ -23801,6 +25261,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23952,6 +25433,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 ""
@@ -24269,9 +25753,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24487,6 +25968,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 ""
@@ -24519,15 +26003,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 ""
@@ -24642,9 +26142,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24823,19 +26320,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"
@@ -25051,6 +26548,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 ""
@@ -25087,6 +26673,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..."
@@ -25239,9 +26828,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26227,9 +27813,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26508,9 +28091,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 d82a40e..fa682b2 100644
--- a/i18n/po/mk.po
+++ b/i18n/po/mk.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-04 03:41+0200\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"
@@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-"X-Launchpad-Export-Date: 2013-08-05 04:51+0000\n"
-"X-Generator: Launchpad (build 16718)\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"
@@ -50,6 +50,9 @@ msgstr "Услови на употреба на позадината"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "Отворањето на врски не е поддржано во тековната подлога (''{0}'')"
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr "ПРЕДУПРЕДУВАЊЕ: {0}"
@@ -59,6 +62,9 @@ msgstr "ИНФО: {0}"
msgid "DEBUG: {0}"
msgstr "ПОШТЕЊЕ: {0}"
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Ја извршувам на подготвителната постапка"
@@ -163,20 +169,17 @@ 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-адреса на прилогот има неочекуван формат. "
"Пренасочувањето кон информативната или историската страница на објектот "
"веројатно нема да успее. Основната адреса гласи: ''{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-адреса на прилогот има неочекуван формат. "
-"Пренасочувањето кон корисничката страница веројатно нема да успее. Основната "
-"адреса гласи: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -264,9 +267,6 @@ msgstr "Алатка: {0}"
msgid "Please select at least four nodes."
msgstr "Ве молам одберете барем четири точки."
-msgid "Information"
-msgstr "Информација"
-
msgid "Align Nodes in Line"
msgstr "Порамни ги точките во линија"
@@ -303,6 +303,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr "Ништо не е означено за зголемување."
+msgid "Information"
+msgstr "Информација"
+
msgid "Zoom to {0}"
msgstr "Зголеми до {0}"
@@ -357,7 +360,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 ""
@@ -537,6 +540,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -650,7 +656,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 ""
@@ -800,8 +806,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"
@@ -986,12 +992,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 ""
@@ -1009,9 +1011,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>"
@@ -1177,9 +1176,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1318,13 +1314,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"
@@ -1413,6 +1409,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 ""
@@ -1697,6 +1714,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1916,8 +1936,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] ""
@@ -2342,6 +2362,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2538,8 +2561,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 ""
@@ -2625,6 +2647,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2661,10 +2686,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"
@@ -2687,8 +2712,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}''"
@@ -2792,6 +2817,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] ""
@@ -2852,8 +2880,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"
@@ -2883,10 +2911,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"
@@ -2907,6 +2935,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,18 +2968,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 ""
@@ -2957,8 +2988,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 ""
@@ -2966,13 +2997,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 ""
@@ -2986,8 +3015,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}"
@@ -3017,11 +3046,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}''."
@@ -3174,8 +3202,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 ""
@@ -3282,7 +3309,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3320,9 +3347,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3361,6 +3385,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3385,6 +3412,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 ""
@@ -3444,6 +3480,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3526,6 +3565,15 @@ 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 ""
@@ -3595,6 +3643,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 ""
@@ -3652,13 +3706,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})"
@@ -3690,10 +3744,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}"
@@ -3827,7 +3881,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3902,6 +3956,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3932,9 +3989,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3959,10 +4013,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''"
@@ -4025,23 +4079,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 ""
@@ -4145,7 +4182,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"
@@ -4374,6 +4411,18 @@ 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 ""
@@ -4478,19 +4527,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 ""
@@ -4778,29 +4814,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"
@@ -4815,7 +4869,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"
@@ -4867,14 +4921,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 ""
@@ -5124,14 +5170,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 ""
@@ -5652,6 +5698,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5735,6 +5784,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 ""
@@ -5825,8 +5901,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 ""
@@ -5996,9 +6071,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 ""
@@ -6283,8 +6355,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"
@@ -6349,34 +6421,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"
@@ -6391,13 +6475,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)"
@@ -6551,7 +6635,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"
@@ -6869,6 +6953,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 ""
@@ -7000,20 +7103,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 ""
@@ -7024,23 +7114,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 ""
@@ -7137,7 +7213,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."
@@ -7236,6 +7312,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7323,7 +7402,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"
@@ -7342,6 +7421,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 ""
@@ -7408,8 +7493,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"
@@ -7484,8 +7568,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 ""
@@ -7499,8 +7583,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"
@@ -7715,12 +7798,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 "
@@ -7729,13 +7806,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7744,6 +7837,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 ""
@@ -7751,8 +7859,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 ..."
@@ -7864,9 +7972,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] ""
@@ -7876,6 +7981,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>"
@@ -7892,7 +8000,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:"
@@ -8038,7 +8146,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8068,7 +8176,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"
@@ -8421,9 +8529,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8442,6 +8547,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 ""
@@ -8499,6 +8607,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8565,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 ""
@@ -8748,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}''..."
@@ -8770,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"
@@ -8780,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:"
@@ -9001,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}''"
@@ -9716,6 +9822,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9784,6 +9923,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9837,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 ""
@@ -10293,6 +10440,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 ""
@@ -10356,7 +10509,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 ""
@@ -10615,40 +10768,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}''"
@@ -10701,8 +10854,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:"
@@ -10711,20 +10864,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 ""
@@ -10806,14 +10964,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"
@@ -10886,7 +11038,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10965,9 +11117,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10986,6 +11135,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 ""
@@ -11015,9 +11172,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 ""
@@ -11048,7 +11245,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 ""
@@ -11088,28 +11285,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..."
@@ -11204,6 +11399,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11219,12 +11417,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}."
@@ -11303,7 +11509,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11402,35 +11608,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 ""
@@ -11440,8 +11622,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 ..."
@@ -11468,10 +11650,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>"
@@ -11555,8 +11734,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}."
@@ -11753,7 +11932,7 @@ 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}"
@@ -11799,6 +11978,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."
@@ -11829,19 +12017,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 ""
@@ -11863,11 +12051,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 ""
@@ -11937,13 +12137,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}''"
@@ -12086,10 +12286,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"
@@ -12104,22 +12304,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}''"
@@ -12188,8 +12387,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..."
@@ -12204,9 +12402,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}''"
@@ -12528,12 +12741,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12544,27 +12756,70 @@ 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 "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] ""
+
+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"
@@ -12578,9 +12833,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."
@@ -12903,6 +13172,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 ""
@@ -13142,6 +13416,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."
@@ -13191,9 +13468,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 ""
@@ -13230,6 +13504,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 ""
@@ -13360,6 +13639,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13450,6 +13732,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 ""
@@ -13468,10 +13794,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13483,6 +13809,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13510,18 +13839,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 ""
@@ -13531,9 +13854,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13543,13 +13863,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13597,6 +13917,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13681,6 +14004,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13785,21 +14111,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 ""
@@ -13815,10 +14150,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"
@@ -13854,7 +14189,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13923,12 +14258,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 ""
@@ -13944,15 +14285,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 ""
@@ -13974,6 +14306,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13983,6 +14324,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13992,10 +14336,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14028,9 +14369,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14070,7 +14408,19 @@ msgstr ""
msgid "Edit Block"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
msgstr ""
msgid "Bollard"
@@ -14088,6 +14438,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14157,19 +14510,16 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
-msgstr ""
-
-msgid "split_rail"
+msgid "pole"
msgstr ""
-msgid "chain"
+msgid "Guard Rail"
msgstr ""
-msgid "hedge"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14200,6 +14550,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14209,10 +14560,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14266,12 +14617,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14332,12 +14677,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14377,9 +14731,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14413,6 +14764,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 ""
@@ -14494,18 +14860,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 ""
@@ -14581,7 +14952,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14605,10 +14976,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"
@@ -14620,9 +14994,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14674,6 +15045,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14686,18 +15060,32 @@ 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 ""
@@ -14797,11 +15185,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14813,11 +15199,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14836,10 +15220,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14869,9 +15253,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14893,10 +15274,29 @@ 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"
@@ -15046,6 +15446,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15067,6 +15470,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15094,6 +15503,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15118,29 +15533,13 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
+msgid "brand"
msgstr ""
-msgctxt "motorcycle"
-msgid "brand"
+msgid "oldtimer"
msgstr ""
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
-msgid "brand"
-msgstr ""
-
-msgid "oldtimer"
-msgstr ""
-
-msgid "Safety inspection"
+msgid "Safety inspection"
msgstr ""
msgid "DEKRA"
@@ -15155,9 +15554,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15352,6 +15748,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15382,6 +15781,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15394,9 +15796,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15406,9 +15805,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15421,6 +15825,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15445,14 +15852,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15501,7 +15900,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15555,41 +15954,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"
@@ -15781,9 +16180,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15805,9 +16201,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15820,6 +16222,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15859,6 +16264,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15880,22 +16288,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"
@@ -16025,49 +16445,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"
@@ -16085,6 +16499,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16097,6 +16517,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16115,37 +16538,137 @@ 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"
@@ -16235,6 +16758,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 ""
@@ -16316,139 +16845,217 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+msgctxt "mounting/support"
+msgid "pole"
msgstr ""
-msgid "Type of shelter"
+msgctxt "mounting/support"
+msgid "wall_mounted"
msgstr ""
-msgctxt "shelter"
-msgid "weather_shelter"
+msgctxt "mounting/support"
+msgid "billboard"
msgstr ""
-msgctxt "shelter"
-msgid "public_transport"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
+msgstr ""
+
+msgid "Type of shelter"
+msgstr ""
+
+msgctxt "shelter"
+msgid "weather_shelter"
+msgstr ""
+
+msgctxt "shelter"
+msgid "public_transport"
msgstr ""
msgctxt "shelter"
@@ -16468,16 +17075,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16511,6 +17124,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16548,117 +17164,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 ""
@@ -16692,33 +17344,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 ""
@@ -16752,6 +17414,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 ""
@@ -16852,36 +17530,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 ""
@@ -16924,19 +17620,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 ""
@@ -17075,6 +17767,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 ""
@@ -17087,60 +17791,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 ""
@@ -17365,41 +18143,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"
@@ -17408,7 +18212,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17420,12 +18224,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 ""
@@ -17477,88 +18371,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"
@@ -17570,6 +18567,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 ""
@@ -17585,6 +18597,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17603,11 +18618,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17716,10 +18729,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17731,7 +18744,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17752,6 +18765,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17764,9 +18780,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17836,7 +18849,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17857,13 +18870,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"
@@ -17872,7 +18885,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17900,6 +18912,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17936,10 +18954,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"
@@ -17969,7 +19008,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17981,19 +19020,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"
@@ -18029,7 +19068,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18242,6 +19281,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18281,24 +19326,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 ""
@@ -18308,15 +19362,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18392,6 +19437,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18446,7 +19497,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18458,6 +19509,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18494,43 +19548,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18569,6 +19650,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18737,21 +19830,50 @@ 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 ""
+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 ""
@@ -18797,19 +19919,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"
@@ -18833,7 +19958,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18929,18 +20054,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 ""
@@ -18950,7 +20084,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18959,10 +20096,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18980,6 +20117,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18995,28 +20135,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"
@@ -19037,19 +20177,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"
@@ -19124,10 +20264,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19142,9 +20285,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19172,6 +20312,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19217,10 +20360,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"
@@ -19232,7 +20405,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"
@@ -19250,7 +20423,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19367,19 +20540,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 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"
@@ -19398,7 +20682,46 @@ 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 "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 "Landsat"
@@ -19410,19 +20733,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 "skobbler heatmap"
@@ -19443,7 +20775,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19452,6 +20784,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19598,6 +20933,29 @@ 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 ""
@@ -19763,6 +21121,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19808,6 +21169,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19994,19 +21388,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20030,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}''."
@@ -20299,10 +21699,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20506,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"
@@ -20777,15 +22180,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20956,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 ""
@@ -20974,12 +22371,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21115,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 ""
@@ -21132,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 ""
@@ -21358,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."
@@ -21408,7 +22808,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21593,6 +22993,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21632,27 +23097,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 ""
@@ -22730,9 +24177,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 ""
@@ -23379,9 +24843,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23434,18 +24895,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 ""
@@ -23792,6 +25241,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23943,6 +25413,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 ""
@@ -24260,9 +25733,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24478,6 +25948,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 ""
@@ -24510,15 +25983,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 ""
@@ -24633,9 +26122,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24814,19 +26300,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"
@@ -25042,6 +26528,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,6 +26653,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..."
@@ -25230,9 +26808,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26218,9 +27793,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26499,9 +28071,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 753a8e7..353a71e 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-08-04 03:41+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-08-05 04:52+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 ""
@@ -250,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -289,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -343,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 ""
@@ -523,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -636,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 ""
@@ -786,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"
@@ -972,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 ""
@@ -995,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>"
@@ -1163,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1304,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"
@@ -1399,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 ""
@@ -1683,6 +1703,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1902,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] ""
@@ -2328,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 ""
@@ -2524,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 ""
@@ -2611,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 ""
@@ -2647,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"
@@ -2673,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}''"
@@ -2778,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] ""
@@ -2838,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"
@@ -2869,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"
@@ -2893,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 ""
@@ -2923,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 ""
@@ -2943,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 ""
@@ -2952,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 ""
@@ -2972,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}"
@@ -3003,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}''."
@@ -3160,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 ""
@@ -3268,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 ""
@@ -3306,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3347,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3371,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 ""
@@ -3430,6 +3469,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3512,6 +3554,15 @@ 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 ""
@@ -3581,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 ""
@@ -3638,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})"
@@ -3676,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}"
@@ -3813,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"
@@ -3888,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 ""
@@ -3918,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3945,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''"
@@ -4011,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 ""
@@ -4131,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"
@@ -4360,6 +4400,18 @@ 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 ""
@@ -4464,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 ""
@@ -4764,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"
@@ -4801,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"
@@ -4853,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 ""
@@ -5110,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 ""
@@ -5638,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5721,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 ""
@@ -5811,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 ""
@@ -5982,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 ""
@@ -6269,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"
@@ -6335,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"
@@ -6377,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)"
@@ -6537,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"
@@ -6855,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 ""
@@ -6986,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 ""
@@ -7010,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 ""
@@ -7123,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."
@@ -7222,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7309,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"
@@ -7328,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 ""
@@ -7394,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"
@@ -7470,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 ""
@@ -7485,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"
@@ -7701,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 "
@@ -7715,13 +7795,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7730,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 ""
@@ -7737,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 ..."
@@ -7850,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] ""
@@ -7862,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>"
@@ -7878,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:"
@@ -8024,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8054,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"
@@ -8407,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8428,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 ""
@@ -8485,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8551,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 ""
@@ -8734,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}''..."
@@ -8756,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"
@@ -8766,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:"
@@ -8987,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}''"
@@ -9702,6 +9811,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9770,6 +9912,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9823,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 ""
@@ -10279,6 +10429,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 ""
@@ -10342,7 +10498,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 ""
@@ -10600,40 +10756,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}''"
@@ -10686,8 +10842,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:"
@@ -10696,20 +10852,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 ""
@@ -10791,14 +10952,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,7 +11026,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10950,9 +11105,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10971,6 +11123,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 ""
@@ -11000,9 +11160,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 ""
@@ -11033,7 +11233,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 ""
@@ -11073,28 +11273,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..."
@@ -11189,6 +11387,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11204,12 +11405,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}."
@@ -11288,7 +11497,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11387,35 +11596,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 ""
@@ -11425,8 +11610,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 ..."
@@ -11453,10 +11638,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>"
@@ -11540,8 +11722,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}."
@@ -11738,7 +11920,7 @@ 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}"
@@ -11784,6 +11966,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."
@@ -11814,19 +12005,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 ""
@@ -11848,11 +12039,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 ""
@@ -11922,13 +12125,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}''"
@@ -12071,10 +12274,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"
@@ -12089,22 +12292,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}''"
@@ -12173,8 +12375,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..."
@@ -12189,9 +12390,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}''"
@@ -12513,12 +12729,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12529,30 +12744,73 @@ 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 "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] ""
+
+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"
@@ -12563,9 +12821,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."
@@ -12888,6 +13160,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 ""
@@ -13127,6 +13404,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."
@@ -13176,9 +13456,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 ""
@@ -13215,6 +13492,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 ""
@@ -13345,6 +13627,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13435,6 +13720,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 ""
@@ -13453,10 +13782,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 +13797,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13495,18 +13827,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 ""
@@ -13516,9 +13842,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13528,13 +13851,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13582,6 +13905,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13666,6 +13992,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13770,21 +14099,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 ""
@@ -13800,10 +14138,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"
@@ -13839,7 +14177,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13908,12 +14246,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 ""
@@ -13929,15 +14273,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 ""
@@ -13959,6 +14294,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13968,6 +14312,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13977,10 +14324,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14013,9 +14357,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14058,6 +14399,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14073,6 +14420,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14142,19 +14492,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14185,6 +14529,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14194,10 +14539,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14251,12 +14596,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14317,12 +14656,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14362,9 +14710,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14398,6 +14743,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 ""
@@ -14479,18 +14839,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 ""
@@ -14566,7 +14931,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14590,10 +14955,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"
@@ -14605,9 +14973,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14659,6 +15024,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14671,6 +15039,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14782,11 +15185,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14798,11 +15199,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14821,10 +15220,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14854,9 +15253,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14878,10 +15274,29 @@ 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"
@@ -15031,6 +15446,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15052,6 +15470,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15079,6 +15503,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15103,22 +15533,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 ""
@@ -15140,9 +15554,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15337,6 +15748,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15367,6 +15781,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15379,9 +15796,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15391,9 +15805,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15406,6 +15825,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15430,14 +15852,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15486,7 +15900,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15540,41 +15954,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"
@@ -15766,9 +16180,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15790,9 +16201,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15805,6 +16222,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15844,6 +16264,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15865,22 +16288,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"
@@ -16010,49 +16445,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"
-msgstr ""
+msgid "Church"
+msgstr "Gereja"
-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"
@@ -16070,6 +16499,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16082,6 +16517,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16100,37 +16538,137 @@ 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"
@@ -16220,6 +16758,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 ""
@@ -16301,125 +16845,203 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
msgstr ""
msgid "Edit Shelter"
@@ -16453,16 +17075,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16496,6 +17124,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16533,117 +17164,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 ""
@@ -16677,33 +17344,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 ""
@@ -16737,6 +17414,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 ""
@@ -16837,36 +17530,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 ""
@@ -16909,19 +17620,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 ""
@@ -17060,6 +17767,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 ""
@@ -17072,60 +17791,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 ""
@@ -17350,41 +18143,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"
@@ -17393,7 +18212,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17405,12 +18224,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 ""
@@ -17462,88 +18371,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17555,6 +18567,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 ""
@@ -17570,6 +18597,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17588,11 +18618,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17701,10 +18729,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17716,7 +18744,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17737,6 +18765,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17749,9 +18780,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17821,7 +18849,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17842,13 +18870,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"
@@ -17857,7 +18885,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17885,6 +18912,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17921,10 +18954,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"
@@ -17954,7 +19008,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17966,19 +19020,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"
@@ -18014,7 +19068,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18227,6 +19281,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18266,24 +19326,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 ""
@@ -18293,15 +19362,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18377,6 +19437,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18431,7 +19497,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18443,6 +19509,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18479,43 +19548,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18554,6 +19650,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18722,21 +19830,50 @@ 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 ""
+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 ""
@@ -18782,19 +19919,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"
@@ -18818,7 +19958,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18914,18 +20054,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 ""
@@ -18935,7 +20084,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18944,10 +20096,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18965,6 +20117,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18980,28 +20135,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"
@@ -19022,19 +20177,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"
@@ -19109,10 +20264,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19127,9 +20285,6 @@ msgstr ""
msgid "One Way"
msgstr "Jalan Sehala"
-msgid "Church"
-msgstr "Gereja"
-
msgid "Fuel Station"
msgstr ""
@@ -19157,6 +20312,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19202,10 +20360,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"
@@ -19217,7 +20405,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"
@@ -19235,7 +20423,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19352,19 +20540,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 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"
@@ -19383,7 +20682,46 @@ 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 "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 "Landsat"
@@ -19395,19 +20733,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 "skobbler heatmap"
@@ -19428,7 +20775,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19437,6 +20784,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19583,6 +20933,29 @@ 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 ""
@@ -19748,6 +21121,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19793,6 +21169,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19979,19 +21388,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20015,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}''."
@@ -20284,10 +21699,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20491,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"
@@ -20762,15 +22180,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20941,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 ""
@@ -20959,12 +22371,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21100,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 ""
@@ -21117,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 ""
@@ -21343,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."
@@ -21393,7 +22808,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21578,6 +22993,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21617,27 +23097,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 ""
@@ -22715,9 +24177,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 ""
@@ -23364,9 +24843,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23419,18 +24895,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 ""
@@ -23777,6 +25241,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23928,6 +25413,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 ""
@@ -24245,9 +25733,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24463,6 +25948,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 ""
@@ -24495,15 +25983,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 ""
@@ -24618,9 +26122,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24799,19 +26300,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"
@@ -25027,6 +26528,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 ""
@@ -25063,6 +26653,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..."
@@ -25215,9 +26808,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26203,9 +27793,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26484,9 +28071,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 52592ca..a1b4f1d 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-08-04 03:41+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-08-05 04:53+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 ""
@@ -254,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"
@@ -293,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}"
@@ -349,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"
@@ -533,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 ""
@@ -646,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."
@@ -798,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"
@@ -984,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 ""
@@ -1007,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>"
@@ -1176,9 +1176,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1321,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"
@@ -1420,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"
@@ -1704,6 +1722,9 @@ 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)"
@@ -1925,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] ""
@@ -2360,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 ""
@@ -2560,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 ""
@@ -2648,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}"
@@ -2684,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"
@@ -2710,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}''"
@@ -2820,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] ""
@@ -2880,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"
@@ -2913,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"
@@ -2937,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 ""
@@ -2967,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 ""
@@ -2987,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 ""
@@ -2996,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 ""
@@ -3016,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}"
@@ -3047,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}''."
@@ -3204,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 ""
@@ -3312,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 ""
@@ -3350,9 +3376,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3393,6 +3416,9 @@ msgstr "gyldighetssjekk – annet"
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Adresser"
@@ -3417,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 ""
@@ -3476,6 +3511,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Dobbelt-Noder"
@@ -3558,6 +3596,15 @@ 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"
@@ -3627,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 ""
@@ -3686,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})"
@@ -3725,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}"
@@ -3867,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"
@@ -3942,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}"
@@ -3972,9 +4028,6 @@ msgstr "bygning"
msgid "area"
msgstr "område"
-msgid "Unclosed way"
-msgstr "Ikke lukket linje"
-
msgid "Unconnected ways"
msgstr ""
@@ -4000,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''"
@@ -4067,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 ""
@@ -4187,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"
@@ -4424,6 +4460,18 @@ 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"
@@ -4528,20 +4576,6 @@ 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 ""
@@ -4837,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."
@@ -4844,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."
@@ -4851,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."
@@ -4870,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"
@@ -4886,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"
@@ -4942,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"
@@ -5203,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 ""
@@ -5731,6 +5775,9 @@ msgstr "Vis/Skjul"
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr "Map Pain stiler"
@@ -5814,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"
@@ -5904,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 ""
@@ -6075,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 ""
@@ -6362,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"
@@ -6428,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"
@@ -6470,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)"
@@ -6630,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"
@@ -6948,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"
@@ -7082,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, "
@@ -7106,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 ""
@@ -7219,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."
@@ -7324,6 +7398,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7423,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"
@@ -7442,10 +7519,16 @@ msgstr "Gi en kort kommentar for endringene du laster opp:"
msgid "Enter an upload comment"
msgstr ""
-msgid "Changeset id:"
+msgid "Specify the data source for the changes:"
msgstr ""
-msgid "Created at:"
+msgid "Enter a source"
+msgstr ""
+
+msgid "Changeset id:"
+msgstr ""
+
+msgid "Created at:"
msgstr ""
msgid "Changeset comment:"
@@ -7508,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"
@@ -7584,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 ""
@@ -7599,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"
@@ -7815,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 "
@@ -7829,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 ""
@@ -7844,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 ""
@@ -7851,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 ..."
@@ -7964,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] ""
@@ -7976,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>"
@@ -7992,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:"
@@ -8138,7 +8244,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8168,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"
@@ -8533,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"
@@ -8554,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"
@@ -8611,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"
@@ -8681,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 ""
@@ -8872,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}''..."
@@ -8894,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"
@@ -8904,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:"
@@ -9125,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}''"
@@ -9854,6 +9958,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9923,6 +10060,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 ""
@@ -9976,6 +10116,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 ""
@@ -10441,6 +10586,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 ""
@@ -10504,8 +10655,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"
@@ -10762,40 +10913,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}''"
@@ -10848,8 +10999,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:"
@@ -10858,20 +11009,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 ""
@@ -10953,16 +11109,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 ""
@@ -11033,8 +11183,8 @@ msgstr "Bruk Objektmal"
msgid "New relation"
msgstr ""
-msgid "Change Properties"
-msgstr "Endre egenskaper"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -11112,9 +11262,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr "Klarte ikke å lese egenskapslista for Objektmaler: {0}"
-
msgid "Error parsing {0}: "
msgstr "Feil ved lesing av {0}: "
@@ -11133,6 +11280,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 ""
@@ -11162,9 +11317,57 @@ 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 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 "Cut"
msgstr ""
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "obligatorisk attributt «{0}» mangler"
+
+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 ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -11196,7 +11399,7 @@ msgid "Contacting OSM Server..."
msgstr "Kontakter OSM-tjeneren …"
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 ""
@@ -11236,28 +11439,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..."
@@ -11356,6 +11557,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 ""
@@ -11371,12 +11575,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}."
@@ -11455,8 +11667,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!"
@@ -11554,42 +11766,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 ""
@@ -11601,8 +11782,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 ..."
@@ -11629,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>"
@@ -11716,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}."
@@ -11915,7 +12093,7 @@ 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}"
@@ -11961,6 +12139,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."
@@ -11991,19 +12178,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 ""
@@ -12025,19 +12212,31 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
-msgid ""
-"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
-"0.1"
+msgid "Link to a OSM data file on your local disk."
msgstr ""
-msgid "Unable to locate file ''{0}''."
+msgid "Include OSM data in the .joz session file."
msgstr ""
-msgid "Unsupported scheme ''{0}'' in URI ''{1}''."
+msgid "OSM data will be included in the session file."
msgstr ""
-msgid "Unexpected root element ''{0}'' in 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 ""
+
+msgid "Unsupported scheme ''{0}'' in URI ''{1}''."
+msgstr ""
+
+msgid "Unexpected root element ''{0}'' in session file"
+msgstr ""
msgid "Version ''{0}'' of session file is not supported. Expected: 0.1"
msgstr ""
@@ -12099,13 +12298,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}''"
@@ -12248,10 +12447,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"
@@ -12266,22 +12465,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}''"
@@ -12354,8 +12552,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..."
@@ -12370,9 +12567,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}''"
@@ -12696,12 +12908,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12712,9 +12923,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 ""
@@ -12746,9 +13000,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."
@@ -13075,6 +13343,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 ""
@@ -13328,6 +13601,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."
@@ -13381,9 +13657,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 ""
@@ -13423,6 +13696,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 ""
@@ -13553,6 +13831,9 @@ msgstr "Øy"
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "Avgift"
+
msgid "Motorway Link"
msgstr "Av-/påkjørsel for motorvei"
@@ -13643,6 +13924,50 @@ msgstr "Boligfeltvei"
msgid "Edit Residential Street"
msgstr "Rediger boligfeltvei"
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr "Type ferdselsvei"
+
+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 "nei"
+
+msgid "destination"
+msgstr "destinasjon"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr "Gatetun"
@@ -13661,11 +13986,11 @@ msgstr "Område"
msgid "Service"
msgstr "Adkomstvei"
-msgid "Edit Serviceway"
-msgstr "Rediger adkomstvei"
+msgid "Edit Service Way"
+msgstr ""
-msgid "Serviceway type"
-msgstr "Type adkomstvei"
+msgid "Service way type"
+msgstr ""
msgid "alley"
msgstr "Smug"
@@ -13676,6 +14001,9 @@ msgstr "Oppkjørsel"
msgid "parking_aisle"
msgstr "parking_aisle"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Parkeringsvei"
@@ -13703,18 +14031,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"
@@ -13724,9 +14046,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr "destinasjon"
-
msgid "delivery"
msgstr "leveranse"
@@ -13736,15 +14055,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 ""
@@ -13790,6 +14109,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr "Offentlig transport"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Minste fart (km/t)"
@@ -13874,6 +14196,9 @@ msgstr "Rediger bro"
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13978,21 +14303,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 ""
@@ -14008,10 +14342,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"
@@ -14047,7 +14381,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -14116,12 +14450,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"
@@ -14137,15 +14477,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)"
@@ -14167,6 +14498,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"
@@ -14176,6 +14516,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Mini-rundkjøring"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Retning"
@@ -14185,11 +14528,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"
@@ -14221,9 +14561,6 @@ msgstr ""
msgid "Passing Place"
msgstr "Passeringspunkt"
-msgid "Edit Passing Place"
-msgstr "Rediger passeringspunkt"
-
msgid "Turning Circle"
msgstr "Vendesirkel"
@@ -14266,6 +14603,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr "Tillatt trafikk:"
+msgid "Material"
+msgstr "Material"
+
+msgid "stone"
+msgstr "stein"
+
msgid "Bollard"
msgstr "Sperresøyle"
@@ -14281,6 +14624,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr "plast"
+
msgid "Cycle Barrier"
msgstr "Halvbommer"
@@ -14350,19 +14696,16 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
-msgstr ""
-
-msgid "split_rail"
+msgid "pole"
msgstr ""
-msgid "chain"
+msgid "Guard Rail"
msgstr ""
-msgid "hedge"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14393,8 +14736,9 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
-msgstr "Rediger dike"
+msgstr ""
msgid "Kerb"
msgstr ""
@@ -14402,11 +14746,11 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
-msgstr "Inngang"
+msgid "Entrance (barrier opening)"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Rediger inngang"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Port"
@@ -14459,6 +14803,15 @@ msgstr ""
msgid "stepover"
msgstr ""
+msgid "Turnstile"
+msgstr "Rotasjonsport"
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Material"
msgstr "Material"
@@ -14525,12 +14878,21 @@ msgstr "Rediger drenering"
msgid "Ditch"
msgstr "Dike"
+msgid "Edit Ditch"
+msgstr "Rediger dike"
+
msgid "Stream"
msgstr "Bekk"
msgid "Edit Stream"
msgstr "Rediger bekk"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Kanal"
@@ -14570,9 +14932,6 @@ msgstr "Rediger demning"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14606,6 +14965,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"
@@ -14687,18 +15061,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 ""
@@ -14774,7 +15153,7 @@ msgstr "turisme"
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14798,10 +15177,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"
@@ -14813,9 +15195,6 @@ msgstr "Smal jernbane"
msgid "Edit Narrow Gauge Rail"
msgstr "Rediger smal jernbane"
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr "Monorail"
@@ -14867,6 +15246,9 @@ msgstr ""
msgid "Level Crossing"
msgstr "Planovergang"
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14879,18 +15261,32 @@ msgstr ""
msgid "Barrier"
msgstr ""
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
msgid "half"
-msgstr "halv"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "full"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "double_half"
msgstr ""
msgid "Crossing"
msgstr "Fotgjengerfelt"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Type fotgjengerfelt"
@@ -14990,11 +15386,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -15006,13 +15400,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"
@@ -15029,12 +15421,12 @@ msgstr "Overflateparkering"
msgid "underground"
msgstr "P-kjeller"
-msgid "Access"
-msgstr "Adkomst"
-
-msgid "customers"
+msgid "rooftop"
msgstr ""
+msgid "Access"
+msgstr "Adkomst"
+
msgid "Park and Ride"
msgstr ""
@@ -15062,9 +15454,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Kapasitet"
@@ -15086,10 +15475,29 @@ msgstr "Åpningstider"
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"
@@ -15239,6 +15647,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr "Spenning"
+
msgid "Amperage"
msgstr ""
@@ -15260,6 +15671,12 @@ msgstr "Verksted"
msgid "Edit Car Repair"
msgstr "Rediger verksted"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15287,6 +15704,12 @@ msgstr "Utleie"
msgid "Edit Car Rental"
msgstr "Rediger bilutleie"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "Bildeling"
@@ -15311,22 +15734,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 ""
@@ -15348,9 +15755,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Klær"
@@ -15545,6 +15949,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15575,6 +15982,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Benk"
@@ -15587,9 +15997,6 @@ msgstr "Rullestol"
msgid "limited"
msgstr "begrenset"
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15599,8 +16006,13 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
-msgstr ""
+msgstr "Stasjon"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Rediger stasjon"
msgid "Building"
msgstr "Bygning"
@@ -15614,6 +16026,9 @@ msgstr "Rediger T-baneinngang"
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15638,14 +16053,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"
@@ -15694,8 +16101,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"
@@ -15748,6 +16155,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 ""
@@ -15770,21 +16192,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 ""
@@ -15974,9 +16381,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr "Turisme"
@@ -15998,9 +16402,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"
@@ -16013,6 +16423,9 @@ msgstr "Gater"
msgid "scheme"
msgstr "Diagram"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Synlig område"
@@ -16052,6 +16465,9 @@ msgstr "… andre typer transport mulig"
msgid "Information Board"
msgstr "Informasjonstavle"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Tavleinnhold"
@@ -16073,23 +16489,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"
@@ -16218,50 +16646,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"
@@ -16278,6 +16700,12 @@ msgstr "katolsk"
msgid "evangelical"
msgstr "evangelisk"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "Jehovas vitner"
@@ -16290,6 +16718,9 @@ msgstr "metodist"
msgid "mormon"
msgstr "mormoner"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ortodoks"
@@ -16308,104 +16739,204 @@ msgstr "quaker"
msgid "roman_catholic"
msgstr ""
-msgid "shia"
-msgstr "shia"
+msgid "russian_orthodox"
+msgstr ""
-msgid "sunni"
-msgstr "sunni"
+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 "School"
-msgstr "Skole"
+msgid "Shinto Shrine"
+msgstr ""
-msgid "Edit School"
-msgstr "Rediger skole"
+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"
+
+msgid "Edit School"
+msgstr "Rediger skole"
msgid "University"
msgstr "Universitet"
@@ -16428,6 +16959,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"
@@ -16509,12 +17046,66 @@ msgstr "Veterinær"
msgid "Edit Veterinary"
msgstr "Rediger veterinær"
-msgid "Drinking water"
+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"
@@ -16524,6 +17115,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 ""
@@ -16533,31 +17148,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 ""
@@ -16585,8 +17206,8 @@ msgstr ""
msgid "Recycling"
msgstr "Returstasjon"
-msgid "Edit Recycling station"
-msgstr "Rediger returstasjon"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Batterier"
@@ -16612,21 +17233,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 "plastic"
-msgstr "plast"
-
msgid "Amount of Seats"
msgstr "Antall seter"
@@ -16661,8 +17276,17 @@ msgstr "Rediger jaktpost"
msgid "Height"
msgstr "Høyde"
+msgctxt "height"
msgid "low"
-msgstr "lav"
+msgstr ""
+
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
msgid "Hide"
msgstr "Skjul"
@@ -16670,9 +17294,6 @@ msgstr "Skjul"
msgid "Lock"
msgstr "Lås"
-msgid "Drinking Water"
-msgstr "Drikkevann"
-
msgid "Edit Source of Potable Water"
msgstr ""
@@ -16704,6 +17325,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16741,119 +17365,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"
@@ -16885,26 +17545,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 ""
@@ -16912,6 +17573,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "bane"
+
+msgid "sports_centre"
+msgstr "sportssenter"
+
+msgid "stadium"
+msgstr "stadion"
+
msgid "10pin"
msgstr "bowling"
@@ -16945,6 +17615,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"
@@ -17001,7 +17687,7 @@ msgid "Skating"
msgstr "Skøyter"
msgid "Edit Skating"
-msgstr "Rediger skøyter"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -17045,36 +17731,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 ""
@@ -17117,19 +17821,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 ""
@@ -17268,6 +17968,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 ""
@@ -17280,60 +17992,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"
@@ -17486,137 +18272,253 @@ msgstr ""
msgid "zircon"
msgstr ""
-msgid "Visible Headframe"
+msgid "Visible Headframe"
+msgstr ""
+
+msgid "Disused"
+msgstr ""
+
+msgid "Adit"
+msgstr ""
+
+msgid "Edit Adit"
+msgstr ""
+
+msgid "Length in meters"
+msgstr ""
+
+msgid "Water Tower"
+msgstr "Vanntårn"
+
+msgid "Edit Water Tower"
+msgstr "Rediger vanntårn"
+
+msgid "Water Works"
+msgstr ""
+
+msgid "Edit Water Works"
+msgstr ""
+
+msgid "Wastewater Plant"
+msgstr "Kloakkrenseanlegg"
+
+msgid "Edit Wastewater Plant"
+msgstr "Rediger kloakkrenseanlegg"
+
+msgid "Watermill"
+msgstr ""
+
+msgid "Edit Watermill"
+msgstr ""
+
+msgid "Fountain"
+msgstr "Fontene"
+
+msgid "Edit Fountain"
+msgstr "Rediger fontene"
+
+msgid "Water Well"
+msgstr ""
+
+msgid "Edit Water Well"
+msgstr ""
+
+msgid "Lighthouse"
+msgstr "Fyrtårn"
+
+msgid "Edit Lighthouse"
+msgstr "Rediger fyrtårn"
+
+msgid "Edit Beacon"
+msgstr "Rediger fyrlykt"
+
+msgid "Street Lamp"
+msgstr ""
+
+msgid "Edit Street Lamp"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
+msgid "Mo-Fr 22:00-05:00"
+msgstr ""
+
+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 "Noise"
+msgstr ""
+
+msgid "GPS Signals"
+msgstr ""
+
+msgid "GLONASS Signals"
+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 "Trigonometrisk punkt"
+
+msgid "Edit Survey Point"
+msgstr "Rediger trigonometrisk punkt"
+
+msgid "Surveillance Camera"
+msgstr ""
+
+msgid "Edit Surveillance Camera"
+msgstr "Rediger overvåkingskamera"
+
+msgid "indoor"
msgstr ""
-msgid "Disused"
+msgid "outdoor"
msgstr ""
-msgid "Adit"
+msgid "Zone"
msgstr ""
-msgid "Edit Adit"
+msgid "parking"
msgstr ""
-msgid "Length in meters"
+msgid "traffic"
msgstr ""
-msgid "Water Tower"
-msgstr "Vanntårn"
-
-msgid "Edit Water Tower"
-msgstr "Rediger vanntårn"
+msgid "shop"
+msgstr "butikk"
-msgid "Water Works"
+msgid "bank"
msgstr ""
-msgid "Edit Water Works"
+msgid "Camera"
msgstr ""
-msgid "Wastewater Plant"
-msgstr "Kloakkrenseanlegg"
-
-msgid "Edit Wastewater Plant"
-msgstr "Rediger kloakkrenseanlegg"
-
-msgid "Watermill"
+msgid "fixed"
msgstr ""
-msgid "Edit Watermill"
+msgid "panning"
msgstr ""
-msgid "Fountain"
-msgstr "Fontene"
-
-msgid "Edit Fountain"
-msgstr "Rediger fontene"
-
-msgid "Water Well"
+msgid "dome"
msgstr ""
-msgid "Edit Water Well"
+msgid "Mounted on"
msgstr ""
-msgid "Lighthouse"
-msgstr "Fyrtårn"
-
-msgid "Edit Lighthouse"
-msgstr "Rediger fyrtårn"
-
-msgid "Edit Beacon"
-msgstr "Rediger fyrlykt"
-
-msgid "Street Lamp"
+msgid "ceiling"
msgstr ""
-msgid "Edit Street Lamp"
+msgid "Direction in degrees"
msgstr ""
-msgid "Operation times"
+msgid "Inclination in degrees"
msgstr ""
-msgid "Mo-Fr 22:00-05:00"
+msgid "Height in meter (m)"
msgstr ""
-msgid "Measurement Station"
+msgid "Power"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Power Plant"
msgstr ""
-msgid "Measurement"
+msgid "Edit Power Plant"
msgstr ""
-msgid "particulate_matter"
+msgid "Start date"
msgstr ""
-msgid "seismic"
+msgid "Output forms of energy"
msgstr ""
-msgid "water_level"
+msgid "(please add this information to the generators if possible)"
msgstr ""
-msgid "weather"
+msgid "electricity"
msgstr ""
-msgid "Recording"
+msgid "2 W"
msgstr ""
-msgid "manually"
+msgid "3 kW"
msgstr ""
-msgid "automated"
+msgid "5 MW"
msgstr ""
-msgid "remote"
+msgid "7 GW"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "hot water"
msgstr ""
-msgid "Survey Point"
-msgstr "Trigonometrisk punkt"
-
-msgid "Edit Survey Point"
-msgstr "Rediger trigonometrisk punkt"
-
-msgid "Surveillance"
-msgstr "Overvåkingskamera"
+msgid "hot air"
+msgstr ""
-msgid "Edit Surveillance Camera"
-msgstr "Rediger overvåkingskamera"
+msgid "cold water"
+msgstr ""
-msgid "indoor"
+msgid "cold air"
msgstr ""
-msgid "outdoor"
+msgid "compressed air"
msgstr ""
-msgid "public"
+msgid "steam"
msgstr ""
-msgid "Power"
+msgid "vacuum"
msgstr ""
msgid "Power Generator"
@@ -17670,89 +18572,192 @@ 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 "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 "Kraftstasjon"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Rediger kraftstasjon"
+msgid "Output forms of energy:"
+msgstr ""
msgid "Power Sub Station"
msgstr "Transformatorstasjon"
@@ -17763,6 +18768,21 @@ 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 ""
@@ -17778,6 +18798,9 @@ msgstr "Rediger kraftmast"
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17796,11 +18819,9 @@ msgstr "Rediger kraftlinje"
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17909,11 +18930,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"
@@ -17924,7 +18945,7 @@ msgstr "Rediger slakter"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17945,6 +18966,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr "Økologisk"
+
msgid "Greengrocer"
msgstr ""
@@ -17957,9 +18981,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr "Økologisk"
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -18029,7 +19050,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -18050,13 +19071,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"
@@ -18065,9 +19086,8 @@ msgstr "Hifi"
msgid "Edit Hifi Shop"
msgstr "Rediger hifi"
-msgctxt "shop"
msgid "Video"
-msgstr ""
+msgstr "Video"
msgid "Edit Video Shop"
msgstr "Rediger video"
@@ -18093,6 +19113,12 @@ msgstr "Rediger vekslingssted"
msgid "Edit Automated Teller Machine"
msgstr "Rediger minibank"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -18129,10 +19155,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"
@@ -18162,7 +19209,7 @@ msgstr "Rediger jernvarehandel"
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18174,19 +19221,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"
@@ -18222,7 +19269,7 @@ msgstr "Rediger reisebyrå"
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18435,6 +19482,12 @@ msgstr "Fjelltopp"
msgid "Edit Peak"
msgstr "Rediger fjelltopp"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Isbre"
@@ -18474,26 +19527,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"
@@ -18501,15 +19563,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 ""
@@ -18585,6 +19638,12 @@ msgstr "Eng"
msgid "Edit Meadow Landuse"
msgstr "Rediger eng"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Vingård"
@@ -18639,8 +19698,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"
@@ -18651,6 +19710,9 @@ msgstr "Gravlund"
msgid "Edit Graveyard"
msgstr "Rediger gravlund"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Kirkegård"
@@ -18717,13 +19779,40 @@ msgstr "Avfallsdeponi"
msgid "Edit Landfill Landuse"
msgstr "Rediger avfallsdeponi"
-msgid "Quarry"
-msgstr "Steinbrudd"
+msgid "Quarry"
+msgstr "Steinbrudd"
+
+msgid "Edit Quarry Landuse"
+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 "Edit Quarry Landuse"
-msgstr "Rediger steinbrudd"
+msgid "International name"
+msgstr ""
-msgid "Annotation"
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18762,6 +19851,18 @@ msgstr "partall"
msgid "alphabetic"
msgstr "alfabetisk"
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18930,20 +20031,49 @@ msgstr ""
msgid "Edit general route"
msgstr ""
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+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"
@@ -18990,19 +20120,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"
@@ -19026,7 +20159,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -19122,18 +20255,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"
@@ -19143,8 +20285,11 @@ msgstr "hinder"
msgid "motorroad"
msgstr "motortrafikkvei"
-msgid "highway_track"
-msgstr "traktorvei"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "service"
@@ -19152,11 +20297,11 @@ 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"
@@ -19173,6 +20318,9 @@ msgstr "stryk"
msgid "railwaypoint"
msgstr "jernbanepunkt"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19188,29 +20336,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"
@@ -19230,20 +20378,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"
@@ -19317,11 +20465,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"
@@ -19335,9 +20486,6 @@ msgstr "Sted/by"
msgid "One Way"
msgstr "Enveiskjøring"
-msgid "Church"
-msgstr "Kirke"
-
msgid "Fuel Station"
msgstr "Bensinstasjon"
@@ -19365,6 +20513,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19410,10 +20561,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"
@@ -19425,7 +20606,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"
@@ -19443,7 +20624,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19560,19 +20741,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 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"
@@ -19591,7 +20883,46 @@ 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 "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 "Landsat"
@@ -19603,19 +20934,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 "skobbler heatmap"
@@ -19636,7 +20976,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19645,6 +20985,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19791,6 +21134,29 @@ 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 ""
@@ -19956,6 +21322,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -20001,6 +21370,39 @@ msgstr ""
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 "Export"
+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 ""
@@ -20204,6 +21606,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 ""
@@ -20225,13 +21639,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20494,10 +21902,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20701,7 +22112,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"
@@ -20972,15 +22383,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -21151,6 +22553,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 ""
@@ -21169,12 +22574,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21321,6 +22720,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 ""
@@ -21339,6 +22741,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?"
@@ -21571,7 +22976,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."
@@ -21624,7 +23032,7 @@ msgstr "Fjern valgte palett fra lista."
msgid "Color Schemes"
msgstr "Farge Palett"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21809,6 +23217,71 @@ msgstr ""
msgid "Show users on map"
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 "Bare posisjon"
@@ -21848,27 +23321,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"
@@ -22959,9 +24414,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 ""
@@ -23613,9 +25085,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 "Process queue"
msgstr ""
@@ -23672,18 +25141,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 ""
@@ -24031,6 +25488,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -24182,6 +25660,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 ""
@@ -24499,9 +25980,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24717,6 +26195,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 ""
@@ -24749,15 +26230,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 ""
@@ -24872,9 +26369,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)"
@@ -25053,19 +26547,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"
@@ -25285,6 +26779,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 ""
@@ -25321,6 +26904,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..."
@@ -25473,9 +27059,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26463,9 +28046,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr "Video"
-
msgid "Import Video"
msgstr ""
@@ -26744,9 +28324,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 a0ebf6f..a9431a5 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-08-04 03:41+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-08-05 04:52+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 ""
@@ -250,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -289,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -343,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 ""
@@ -523,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -636,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 ""
@@ -786,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"
@@ -972,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 ""
@@ -995,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>"
@@ -1163,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1304,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"
@@ -1399,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 ""
@@ -1683,6 +1703,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1902,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] ""
@@ -2328,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 ""
@@ -2524,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 ""
@@ -2611,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 ""
@@ -2647,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"
@@ -2672,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}''"
@@ -2777,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] ""
@@ -2837,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"
@@ -2868,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"
@@ -2892,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 ""
@@ -2922,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 ""
@@ -2942,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 ""
@@ -2951,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 ""
@@ -2971,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}"
@@ -3002,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}''."
@@ -3159,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 ""
@@ -3267,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 ""
@@ -3305,9 +3335,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3346,6 +3373,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3370,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 ""
@@ -3429,6 +3468,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3511,6 +3553,15 @@ 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 ""
@@ -3580,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 ""
@@ -3637,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})"
@@ -3675,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}"
@@ -3812,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"
@@ -3887,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 ""
@@ -3917,9 +3977,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3944,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''"
@@ -4010,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 ""
@@ -4130,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"
@@ -4359,6 +4399,18 @@ 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 ""
@@ -4463,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 ""
@@ -4763,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 "> 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"
@@ -4800,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"
@@ -4852,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 ""
@@ -5109,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 ""
@@ -5637,6 +5686,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5720,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 ""
@@ -5810,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 ""
@@ -5981,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 ""
@@ -6268,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"
@@ -6334,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"
@@ -6376,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)"
@@ -6536,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"
@@ -6854,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 ""
@@ -6985,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 ""
@@ -7009,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 ""
@@ -7122,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."
@@ -7221,6 +7300,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7308,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"
@@ -7327,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 ""
@@ -7393,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"
@@ -7469,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 ""
@@ -7484,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"
@@ -7700,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 "
@@ -7714,13 +7794,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7729,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 ""
@@ -7736,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 ..."
@@ -7849,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] ""
@@ -7861,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>"
@@ -7877,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:"
@@ -8023,7 +8134,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8053,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"
@@ -8406,9 +8517,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8427,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 ""
@@ -8484,6 +8595,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8550,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 ""
@@ -8733,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}''..."
@@ -8755,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"
@@ -8765,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:"
@@ -8986,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}''"
@@ -9701,6 +9810,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9769,6 +9911,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9822,6 +9967,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 ""
@@ -10278,6 +10428,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 ""
@@ -10341,7 +10497,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 ""
@@ -10599,40 +10755,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}''"
@@ -10685,8 +10841,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:"
@@ -10695,20 +10851,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 ""
@@ -10790,14 +10951,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"
@@ -10870,7 +11025,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10949,9 +11104,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10970,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 ""
@@ -10999,9 +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 ""
@@ -11032,7 +11232,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 ""
@@ -11072,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..."
@@ -11188,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 ""
@@ -11203,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}."
@@ -11287,7 +11496,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11386,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 ""
@@ -11424,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 ..."
@@ -11452,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>"
@@ -11539,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}."
@@ -11737,7 +11919,7 @@ 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}"
@@ -11783,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."
@@ -11813,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 ""
@@ -11847,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 ""
@@ -11921,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}''"
@@ -12070,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"
@@ -12088,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}''"
@@ -12172,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..."
@@ -12188,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}''"
@@ -12512,12 +12728,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12528,30 +12743,73 @@ 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 "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] ""
+
+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"
@@ -12562,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."
@@ -12887,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 ""
@@ -13126,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."
@@ -13175,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 ""
@@ -13214,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 ""
@@ -13344,6 +13626,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13434,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 ""
@@ -13452,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"
@@ -13467,6 +13796,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13494,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 ""
@@ -13515,9 +13841,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13527,13 +13850,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13581,6 +13904,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13665,6 +13991,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13769,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 ""
@@ -13799,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"
@@ -13838,7 +14176,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13907,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 ""
@@ -13928,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 ""
@@ -13958,6 +14293,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13967,6 +14311,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13976,10 +14323,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14012,9 +14356,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14057,6 +14398,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14072,6 +14419,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14141,19 +14491,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14184,6 +14528,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14193,10 +14538,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14250,12 +14595,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14316,12 +14655,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14361,9 +14709,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14397,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 "Land"
@@ -14478,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 ""
@@ -14565,7 +14930,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14589,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"
@@ -14604,9 +14972,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14658,6 +15023,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14670,6 +15038,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14781,11 +15184,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14797,11 +15198,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14820,10 +15219,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14853,9 +15252,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14877,10 +15273,29 @@ 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"
@@ -15030,6 +15445,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15051,6 +15469,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15078,6 +15502,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15102,22 +15532,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 ""
@@ -15139,9 +15553,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15336,6 +15747,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15366,6 +15780,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15378,9 +15795,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15390,9 +15804,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15405,6 +15824,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15429,14 +15851,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15485,7 +15899,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15539,41 +15953,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"
@@ -15765,9 +16179,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15789,9 +16200,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15804,6 +16221,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15843,6 +16263,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15864,22 +16287,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"
@@ -16009,49 +16444,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"
@@ -16069,6 +16498,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16081,6 +16516,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16099,37 +16537,137 @@ 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"
@@ -16219,6 +16757,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"
@@ -16300,128 +16844,206 @@ msgstr "Tierarz"
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16452,16 +17074,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16495,6 +17123,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16532,117 +17163,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 ""
@@ -16676,33 +17343,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 ""
@@ -16736,6 +17413,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 ""
@@ -16836,36 +17529,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 ""
@@ -16908,19 +17619,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 ""
@@ -17059,6 +17766,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 ""
@@ -17071,60 +17790,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 ""
@@ -17349,41 +18142,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"
@@ -17392,7 +18211,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17404,12 +18223,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 ""
@@ -17461,88 +18370,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17554,6 +18566,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 ""
@@ -17569,6 +18596,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17587,11 +18617,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17700,10 +18728,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17715,7 +18743,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17736,6 +18764,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17748,9 +18779,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17820,7 +18848,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17841,13 +18869,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"
@@ -17856,7 +18884,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17884,6 +18911,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17920,10 +18953,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"
@@ -17953,7 +19007,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17965,19 +19019,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"
@@ -18013,7 +19067,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18226,6 +19280,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18265,24 +19325,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 ""
@@ -18292,15 +19361,6 @@ msgstr "Woold"
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18376,6 +19436,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18430,7 +19496,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18442,6 +19508,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18478,43 +19547,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18553,6 +19649,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18721,21 +19829,50 @@ 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 ""
+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 ""
@@ -18781,19 +19918,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"
@@ -18817,7 +19957,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18913,18 +20053,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 ""
@@ -18934,7 +20083,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18943,10 +20095,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18964,6 +20116,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18979,28 +20134,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"
@@ -19021,19 +20176,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"
@@ -19108,10 +20263,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19126,9 +20284,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19156,6 +20311,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19201,10 +20359,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"
@@ -19216,7 +20404,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"
@@ -19234,7 +20422,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19351,19 +20539,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 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"
@@ -19382,7 +20681,46 @@ 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 "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 "Landsat"
@@ -19394,19 +20732,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 "skobbler heatmap"
@@ -19427,7 +20774,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19436,6 +20783,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19582,6 +20932,29 @@ 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 ""
@@ -19747,6 +21120,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19792,6 +21168,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19978,19 +21387,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20014,13 +21435,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20283,10 +21698,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20490,7 +21908,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"
@@ -20761,15 +22179,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20940,6 +22349,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 ""
@@ -20958,12 +22370,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21099,6 +22505,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 ""
@@ -21116,6 +22525,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 ""
@@ -21342,7 +22754,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."
@@ -21392,7 +22807,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21577,6 +22992,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21616,27 +23096,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 ""
@@ -22714,9 +24176,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 ""
@@ -23363,9 +24842,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23418,18 +24894,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 ""
@@ -23776,6 +25240,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23927,6 +25412,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 ""
@@ -24244,9 +25732,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24462,6 +25947,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 ""
@@ -24494,15 +25982,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 ""
@@ -24617,9 +26121,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24798,19 +26299,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"
@@ -25026,6 +26527,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 ""
@@ -25062,6 +26652,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..."
@@ -25214,9 +26807,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26202,9 +27792,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26483,9 +28070,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 2753dc1..0842d0a 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-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-08-03 15:49+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-08-05 04:39+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ 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}"
@@ -60,6 +63,9 @@ msgstr "INFO: {0}"
msgid "DEBUG: {0}"
msgstr "DEBUGGEN: {0}"
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Platform-opstarthook uitvoeren"
@@ -165,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 "
@@ -268,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"
@@ -307,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}"
@@ -364,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 één 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"
@@ -559,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)"
@@ -688,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"
@@ -863,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"
@@ -1076,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 "
@@ -1105,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>"
@@ -1289,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"
@@ -1445,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"
@@ -1560,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"
@@ -1827,8 +1849,7 @@ 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."
@@ -1864,6 +1885,9 @@ 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)"
@@ -2111,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 ""
@@ -2597,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"
@@ -2810,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 "
@@ -2909,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"
@@ -2945,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"
@@ -2974,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}\""
@@ -3094,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"
@@ -3160,12 +3192,11 @@ 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"
@@ -3194,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"
@@ -3224,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}"
@@ -3258,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 "
@@ -3283,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 "
@@ -3296,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 "
@@ -3325,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}"
@@ -3360,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}''."
@@ -3538,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 ""
@@ -3654,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 ""
@@ -3697,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"
@@ -3740,6 +3765,9 @@ 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"
@@ -3764,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"
@@ -3825,6 +3862,9 @@ msgstr " of "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0} is vervallen, gebruik {1} in plaats hiervan"
+msgid "{0} is unnecessary"
+msgstr "{0} is niet nodig"
+
msgid "Duplicated nodes"
msgstr "Gedupliceerde knopen"
@@ -3912,6 +3952,15 @@ 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"
@@ -3986,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"
@@ -4047,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})"
@@ -4089,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}"
@@ -4236,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"
@@ -4313,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}"
@@ -4343,9 +4401,6 @@ msgstr "gebouw"
msgid "area"
msgstr "gebied"
-msgid "Unclosed way"
-msgstr "Niet-gesloten weg"
-
msgid "Unconnected ways"
msgstr "Niet-verbonden wegen"
@@ -4374,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''"
@@ -4440,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)"
@@ -4510,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"
@@ -4563,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"
@@ -4813,6 +4848,18 @@ 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"
@@ -4919,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)"
@@ -5255,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."
@@ -5262,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."
@@ -5269,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."
@@ -5288,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"
@@ -5304,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"
@@ -5362,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"
@@ -5654,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 "
@@ -6259,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"
@@ -6343,6 +6386,38 @@ msgstr "Is stijl op dit moment actief?"
msgid "No"
msgstr "Neen"
+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 ""
+"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"
@@ -6435,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 "
@@ -6621,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."
@@ -6972,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 ""
@@ -7048,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"
@@ -7090,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)"
@@ -7260,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"
@@ -7622,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"
@@ -7778,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, "
@@ -7805,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"
@@ -7846,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 ..."
@@ -7874,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 "
@@ -7942,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."
@@ -8052,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"
@@ -8161,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"
@@ -8185,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:"
@@ -8253,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"
@@ -8339,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 "
@@ -8360,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"
@@ -8619,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 "
@@ -8639,13 +8708,34 @@ 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 "Return to the previous dialog to enter a more descriptive comment"
+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 ""
-"Terug naar het vorige dialoogvenster om een meer beschrijvende opmerking in "
-"te voeren"
+"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 "Cancel and return to the previous dialog"
-msgstr "Annuleren en terug naar het vorige dialoogvenster"
+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 "
+"te voeren"
+
+msgid "Cancel and return to the previous dialog"
+msgstr "Annuleren en terug naar het vorige dialoogvenster"
msgid "Do not show this message again"
msgstr "Toon dit bericht niet meer"
@@ -8656,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"
@@ -8663,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 ..."
@@ -8808,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..."
@@ -8819,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 "
@@ -8842,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:"
@@ -8998,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"
@@ -9031,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"
@@ -9409,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..."
@@ -9430,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"
@@ -9489,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"
@@ -9572,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"
@@ -9775,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}''..."
@@ -9803,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"
@@ -9815,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:"
@@ -10096,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}''"
@@ -10915,6 +11015,39 @@ 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"
+
+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: NonDefalut"
msgstr "Uitgebreide achtergrond: Niet standaard"
@@ -10984,6 +11117,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"
@@ -11046,6 +11182,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"
@@ -11544,6 +11687,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"
@@ -11616,10 +11765,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"
@@ -11905,21 +12052,6 @@ msgstr "Zwitsers raster (Zwitserland)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr "<i>CH1903 / LV03 (zonder lokale correcties)</i>"
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "UTM-zone"
-
-msgid "North"
-msgstr "Noorden"
-
-msgid "South"
-msgstr "Zuiden"
-
-msgid "Hemisphere"
-msgstr "Halfrond"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadeloupe Fort-Marigot 1949"
@@ -11941,6 +12073,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}''"
@@ -12006,11 +12153,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:"
@@ -12018,29 +12165,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. "
@@ -12133,18 +12282,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 proxyservers 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"
@@ -12216,8 +12359,8 @@ msgstr "Voorkeuze toepassen"
msgid "New relation"
msgstr "Nieuwe relatie"
-msgid "Change Properties"
-msgstr "Eigenschappen veranderen"
+msgid "Change Tags"
+msgstr "Tags wijzigen"
msgid "Unknown requisite: {0}"
msgstr "Onbekend vereiste: {0}"
@@ -12305,9 +12448,6 @@ 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}: "
@@ -12326,6 +12466,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 (*.*)"
@@ -12360,9 +12510,61 @@ msgid ""
msgstr ""
"De huidige waarde is geen geldige ID voor OSM. Voer een geheel getal > 0 in"
+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 "Cut"
msgstr "Knippen"
+msgid "Right click = copy to clipboard"
+msgstr "Klik met rechts = kopieer naar klembord"
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "Ontbrekend verplicht attribuut ''{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 ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -12398,11 +12600,11 @@ 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."
@@ -12449,40 +12651,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 proxyservers 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..."
@@ -12584,6 +12781,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}."
@@ -12599,15 +12799,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."
@@ -12693,8 +12901,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!"
@@ -12802,48 +13010,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 "
@@ -12853,11 +13028,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 ..."
@@ -12886,12 +13061,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>"
@@ -12984,11 +13155,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}."
@@ -13194,10 +13365,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 "RemoteControl::Accepting connections on port {0}"
msgstr "Afstandsbediening::Accepteren van verbindingen op poort {0}"
@@ -13248,6 +13423,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."
@@ -13284,20 +13468,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: "
@@ -13322,13 +13506,25 @@ 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 ""
-"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
-"0.1"
-msgstr ""
-"Versie ''{0}'' van metagegevens voor gegevenslaag van OSM wordt niet "
-"ondersteund. Verwacht: 0.1"
-
+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"
+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."
@@ -13403,18 +13599,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"
@@ -13585,11 +13781,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"
@@ -13603,30 +13799,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: installeren van plug-in ''{0}'' vanuit het tijdelijke "
-"gedownloade bestand ''{1}'' mislukt. {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"
@@ -13634,8 +13828,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}."
@@ -13704,11 +13898,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 ""
@@ -13723,12 +13916,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}''"
@@ -13741,7 +13949,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}''"
@@ -13769,7 +13977,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."
@@ -14189,17 +14397,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 "Failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "Afhandelen van zip-bestand ''{0}'' mislukt. Exceptie was: {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 ""
-"Waarschuwing: toegang tot map ''{0}'' mislukt wegens veiligheidsredenen. "
-"Uitzondering was: {1}"
+"Toegang tot map ''{0}'' mislukt om beveiligingsredenen. Exceptie was: {1}"
msgid "{0}... [please type its number]"
msgstr "{0}... [typ het nummer]"
@@ -14211,9 +14415,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}''."
@@ -14248,8 +14499,22 @@ msgstr ""
"<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 "
@@ -14270,7 +14535,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 ""
@@ -14595,6 +14860,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 ""
@@ -14919,6 +15191,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."
@@ -14981,9 +15256,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"
@@ -15034,6 +15306,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"
@@ -15181,6 +15460,9 @@ msgstr "Verhoging"
msgid "Lit"
msgstr "Verlicht"
+msgid "Toll"
+msgstr "Tol"
+
msgid "Motorway Link"
msgstr "Af-/Oprit autosnelweg"
@@ -15271,6 +15553,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"
@@ -15289,11 +15615,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"
@@ -15304,6 +15630,9 @@ msgstr "oprit"
msgid "parking_aisle"
msgstr "Weg op parkeerplaats"
+msgid "drive-through"
+msgstr "doorgang"
+
msgid "Parking Aisle"
msgstr "Weg op parkeerplaats"
@@ -15331,18 +15660,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"
@@ -15352,9 +15675,6 @@ msgstr "Toegangsbeperkingen"
msgid "General Access"
msgstr "Algemene toegang"
-msgid "destination"
-msgstr "bestemmingsverkeer"
-
msgid "delivery"
msgstr "afleveren goederen"
@@ -15364,15 +15684,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"
@@ -15418,6 +15738,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)"
@@ -15502,6 +15825,9 @@ msgstr "Een brug bewerken"
msgid "viaduct"
msgstr "viaduct"
+msgid "suspension"
+msgstr "overspanning"
+
msgid "swing"
msgstr "hangbrug"
@@ -15619,20 +15945,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"
@@ -15649,11 +15984,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"
@@ -15688,8 +16023,8 @@ msgstr "Fietspad rechts"
msgid "Oneway (bicycle)"
msgstr "Eénrichting (fiets)"
-msgid "Edit Highway"
-msgstr "Highway bewerken"
+msgid "Edit Highway Attributes:"
+msgstr "Bewerken Attributen Highway:"
msgid "Highway"
msgstr "Highway"
@@ -15757,12 +16092,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"
@@ -15778,15 +16119,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)"
@@ -15808,6 +16140,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"
@@ -15817,6 +16158,9 @@ msgstr "Voorrang verlenen"
msgid "Mini-roundabout"
msgstr "Mini-rotonde"
+msgid "Edit Mini-Roundabout"
+msgstr "Bewerken: Minirotonde"
+
msgid "Direction"
msgstr "Richting"
@@ -15826,11 +16170,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"
@@ -15862,9 +16203,6 @@ msgstr "verkeersplateau"
msgid "Passing Place"
msgstr "Passeerstrook"
-msgid "Edit Passing Place"
-msgstr "Passeerstrook bewerken"
-
msgid "Turning Circle"
msgstr "Draaicirkel"
@@ -15907,6 +16245,12 @@ msgstr "Blok bewerken"
msgid "Allowed traffic:"
msgstr "Toegestaan verkeer:"
+msgid "Material"
+msgstr "Materiaal"
+
+msgid "stone"
+msgstr "steen"
+
msgid "Bollard"
msgstr "Verkeerspaal"
@@ -15922,6 +16266,9 @@ msgstr "stijgend"
msgid "removable"
msgstr "verwijderbaar"
+msgid "plastic"
+msgstr "plastiek"
+
msgid "Cycle Barrier"
msgstr "Fietshekje"
@@ -15991,20 +16338,17 @@ msgstr "ketting"
msgid "electric"
msgstr "elektrisch"
-msgid "roundpole"
-msgstr "ronde paal"
-
-msgid "split_rail"
-msgstr "boomstammen"
+msgid "pole"
+msgstr "paal"
-msgid "chain"
-msgstr "ketting"
+msgid "Guard Rail"
+msgstr "Vangrail"
-msgid "hedge"
-msgstr "heg"
+msgid "Edit Guard Rail"
+msgstr "Vangrail bewerken"
-msgid "pole"
-msgstr "paal"
+msgid "wire"
+msgstr "draad"
msgid "Guard Rail"
msgstr "Vangrail"
@@ -16034,8 +16378,9 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr "Gracht"
+msgctxt "Barrier"
msgid "Edit Ditch"
-msgstr "Gracht bewerken"
+msgstr "Bewerken Gracht"
msgid "Kerb"
msgstr "Berm"
@@ -16043,11 +16388,11 @@ msgstr "Berm"
msgid "Edit Kerb"
msgstr "Berm bewerken"
-msgid "Entrance"
-msgstr "Doorgang"
+msgid "Entrance (barrier opening)"
+msgstr "Ingang (barrière-opening)"
-msgid "Edit Entrance"
-msgstr "Doorgang bewerken"
+msgid "Edit Entrance (barrier opening)"
+msgstr "Bewerken Ingang (barrière-opening)"
msgid "Gate"
msgstr "Gate"
@@ -16100,12 +16445,6 @@ msgstr "versmalling"
msgid "stepover"
msgstr "overstap"
-msgid "Material"
-msgstr "Materiaal"
-
-msgid "stone"
-msgstr "steen"
-
msgid "Turnstile"
msgstr "Draaipoortje"
@@ -16166,12 +16505,21 @@ msgstr "Greppel bewerken"
msgid "Ditch"
msgstr "Gracht"
+msgid "Edit Ditch"
+msgstr "Gracht bewerken"
+
msgid "Stream"
msgstr "Beek"
msgid "Edit Stream"
msgstr "Beek bewerken"
+msgid "Wadi"
+msgstr "Wadi"
+
+msgid "Edit Wadi"
+msgstr "Bewerken Wadi"
+
msgid "Canal"
msgstr "Kanaal"
@@ -16211,9 +16559,6 @@ msgstr "Dam bewerken"
msgid "Groyne"
msgstr "Strekdam"
-msgid "Edit Groyne"
-msgstr "Strekdam bewerken"
-
msgid "Breakwater"
msgstr "Golfbreker"
@@ -16247,6 +16592,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"
@@ -16328,20 +16688,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"
@@ -16415,8 +16780,8 @@ msgstr "toerisme"
msgid "freight"
msgstr "Vracht"
-msgid "Service/Type"
-msgstr "Service/Type"
+msgid "Service type"
+msgstr "Type Service"
msgid "yard"
msgstr "tuin"
@@ -16439,11 +16804,14 @@ msgstr "bovenleiding"
msgid "rail"
msgstr "spoor"
-msgid "Voltage"
-msgstr "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr "Voltage in Volt (V)"
-msgid "Frequency (Hz)"
-msgstr "Frequentie (Hz)"
+msgid "Frequency in Hertz (Hz)"
+msgstr "Frequentie in Hertz (Hz)"
+
+msgid "16.67"
+msgstr "16.67"
msgid "16.7"
msgstr "16,7"
@@ -16454,9 +16822,6 @@ msgstr "Smalspoor"
msgid "Edit Narrow Gauge Rail"
msgstr "Smalspoor bewerken"
-msgid "Types"
-msgstr "Types"
-
msgid "Monorail"
msgstr "Monorail"
@@ -16508,6 +16873,9 @@ msgstr "Spoorweg buiten gebruik bewerken"
msgid "Level Crossing"
msgstr "Bewaakte spoorwegovergang"
+msgid "Edit Level Crossing"
+msgstr "Bewerken Spoorwegovergang"
+
msgid "Supervised"
msgstr "Toezicht"
@@ -16520,18 +16888,32 @@ 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 "half"
+msgstr "helft"
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "hoog"
+msgstr "volledig"
+msgctxt "crossing:barrier"
msgid "double_half"
-msgstr "dubbel_helft"
+msgstr "dubbele_helft"
msgid "Crossing"
msgstr "Onbewaakte spoorwegovergang"
+msgid "Edit Crossing"
+msgstr "Bewerken Voetgangersoversteekplaats"
+
msgid "Crossing type"
msgstr "Type oversteekplaats"
@@ -16631,13 +17013,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"
@@ -16647,13 +17027,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"
@@ -16670,12 +17048,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)"
@@ -16703,9 +17081,6 @@ msgstr "Parkeerplaats"
msgid "Edit Parking space"
msgstr "Parkeerplaats bewerken"
-msgid "rooftop"
-msgstr "dak"
-
msgid "Capacity"
msgstr "Capaciteit"
@@ -16727,11 +17102,32 @@ 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"
@@ -16880,6 +17276,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"
@@ -16901,6 +17300,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"
@@ -16928,6 +17333,12 @@ msgstr "Verhuur"
msgid "Edit Car Rental"
msgstr "Autoverhuur bewerken"
+msgid "Second hand"
+msgstr "Tweedehands"
+
+msgid "only"
+msgstr "alleen"
+
msgid "Sharing"
msgstr "Auto delen"
@@ -16952,22 +17363,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"
@@ -16989,9 +17384,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Onderdelen"
-
msgid "Clothes"
msgstr "Kleding"
@@ -17187,6 +17579,9 @@ msgstr "Perron"
msgid "Station or amenities"
msgstr "Station of faciliteiten"
+msgid "Edit Stop Position"
+msgstr "Bewerken Halteplaats"
+
msgid "Bus"
msgstr "Bus"
@@ -17217,6 +17612,9 @@ msgstr "Kabelbaan"
msgid "Ferry"
msgstr "Veerboot"
+msgid "Edit Platform"
+msgstr "Bewerken Platform"
+
msgid "Bench"
msgstr "Bank"
@@ -17229,9 +17627,6 @@ msgstr "Rolstoel"
msgid "limited"
msgstr "beperkt"
-msgid "only"
-msgstr "alleen"
-
msgid "Highway platform (legacy)"
msgstr "Hoofdperron (oud)"
@@ -17241,9 +17636,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"
@@ -17256,6 +17656,9 @@ msgstr "In-/uitgang metro bewerken"
msgid "Ticket Machine"
msgstr "Kaartjesautomaat"
+msgid "Edit Ticket Machine"
+msgstr "Bewerken Kaartautomaat"
+
msgid "Reference Number"
msgstr "Referentienummer"
@@ -17280,14 +17683,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)"
@@ -17336,8 +17731,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"
@@ -17390,6 +17785,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"
@@ -17412,21 +17822,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"
@@ -17616,9 +18011,6 @@ msgstr "Stripclub"
msgid "Edit Stripclub"
msgstr "Stripclub 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 "Tourism"
msgstr "Toerisme"
@@ -17640,9 +18032,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"
@@ -17655,6 +18053,9 @@ msgstr "straat"
msgid "scheme"
msgstr "schema"
+msgid "toposcope"
+msgstr "markering"
+
msgid "Shown Area"
msgstr "Weergegeven gebied"
@@ -17694,6 +18095,9 @@ msgstr "... ander mogelijk vervoer"
msgid "Information Board"
msgstr "Informatiebord"
+msgid "Edit Information Board"
+msgstr "Bewerken Informatie (bord)"
+
msgid "Board Content"
msgstr "Inhoud bord"
@@ -17715,23 +18119,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"
@@ -17860,50 +18276,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 "Recording Studio"
+msgstr "Opnamestudio"
-msgid "Religion"
-msgstr "Religie"
+msgid "Edit Studio"
+msgstr "Opnamestudio bewerken"
-msgid "bahai"
-msgstr "Bahai"
+msgid "audio"
+msgstr "audio"
-msgid "buddhist"
-msgstr "Boeddhisme"
+msgid "video"
+msgstr "video"
-msgid "christian"
-msgstr "Christelijk"
+msgid "Place of Worship"
+msgstr "Religieus gebouw"
-msgid "hindu"
-msgstr "Hindoestaans"
+msgid "Church"
+msgstr "Kerk"
-msgid "jain"
-msgstr "Jain"
+msgid "Edit Church"
+msgstr "Kerk bewerken"
-msgid "jewish"
-msgstr "Joods"
+msgid "Building type"
+msgstr "Type gebouw"
-msgid "muslim"
-msgstr "Moslim"
+msgid "basilica"
+msgstr "basiliek"
-msgid "sikh"
-msgstr "Sikh"
+msgid "cathedral"
+msgstr "kathedraal"
-msgid "spiritualist"
-msgstr "Spiritualist"
-
-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"
@@ -17920,6 +18330,12 @@ 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"
@@ -17932,6 +18348,9 @@ msgstr "Methodist"
msgid "mormon"
msgstr "Mormoon"
+msgid "new_apostolic"
+msgstr "nieuw_apostolisch"
+
msgid "orthodox"
msgstr "Orthodox"
@@ -17950,38 +18369,140 @@ 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"
@@ -18070,6 +18591,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"
@@ -18151,12 +18678,66 @@ msgstr "Dierenarts"
msgid "Edit Veterinary"
msgstr "Dierenarts bewerken"
-msgid "Drinking water"
-msgstr "Drinkwater"
+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"
@@ -18166,6 +18747,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"
@@ -18175,31 +18780,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"
@@ -18227,8 +18838,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"
@@ -18254,21 +18865,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 "plastic"
-msgstr "plastiek"
-
msgid "Amount of Seats"
msgstr "Aantal zitplaatsen"
@@ -18303,18 +18908,24 @@ msgstr "Jachthut bewerken"
msgid "Height"
msgstr "Hoogte"
+msgctxt "height"
msgid "low"
msgstr "laag"
+msgctxt "height"
+msgid "half"
+msgstr "helft"
+
+msgctxt "height"
+msgid "full"
+msgstr "volledig"
+
msgid "Hide"
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"
@@ -18346,6 +18957,9 @@ msgstr "vijver"
msgid "Diameter (in mm)"
msgstr "Diameter (in mm)"
+msgid "Hydrant Position"
+msgstr "Positie hydrant"
+
msgctxt "hydrant position"
msgid "lane"
msgstr "rijstrook"
@@ -18383,119 +18997,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"
@@ -18527,26 +19177,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"
@@ -18554,6 +19205,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"
@@ -18587,6 +19247,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"
@@ -18643,7 +19319,7 @@ msgid "Skating"
msgstr "Schaatsen"
msgid "Edit Skating"
-msgstr "Schaatsen bewerken"
+msgstr "Bewerken Schaatsen"
msgid "ice_rink"
msgstr "schaatsbaan"
@@ -18687,38 +19363,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"
@@ -18759,19 +19453,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"
@@ -18910,6 +19600,18 @@ msgstr "Modelvliegtuigen"
msgid "Edit Model Aerodrome"
msgstr "Modelvliegtuigen bewerken"
+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"
@@ -18922,59 +19624,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"
@@ -19200,42 +19976,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"
@@ -19243,8 +20045,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"
@@ -19255,12 +20057,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"
@@ -19312,89 +20204,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 "kaplan_turbine"
+msgstr "Kaplanturbine"
+
+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 "Boiling Water Reactor 2 (BWR-2)"
+msgstr "Boiling Water Reactor 2 (BWR-2)"
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr "Boiling Water Reactor 3 (BWR-3)"
+
+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 "steam"
-msgstr "stoom"
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr "Inertial Confinement Fusion (ICF)"
-msgid "vacuum"
-msgstr "vacuüm"
+msgid "Pressurized water reactor (PWR)"
+msgstr "Pressurized water reactor (PWR)"
-msgid "battery charging"
-msgstr "opladen van batterijen"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
-msgid "Power Station"
-msgstr "Verdeelstation"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
-msgid "Edit Power Station"
-msgstr "Verdeelstation bewerken"
+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"
@@ -19405,6 +20400,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"
@@ -19420,6 +20430,9 @@ msgstr "Hoogspanningsmast bewerken"
msgid "Tower reference"
msgstr "Referentie toren"
+msgid "steel"
+msgstr "staal"
+
msgid "Pole"
msgstr "Electriciteitsmast"
@@ -19438,13 +20451,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"
@@ -19551,11 +20562,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"
@@ -19566,8 +20577,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)"
@@ -19587,6 +20598,9 @@ msgstr "Markt"
msgid "Edit Marketplace"
msgstr "Markt bewerken"
+msgid "Organic"
+msgstr "Biologische winkel"
+
msgid "Greengrocer"
msgstr "Groentewinkel"
@@ -19599,9 +20613,6 @@ msgstr "Boerderijstalletje"
msgid "Edit Farm Stand"
msgstr "Bewerken Boerderijstalletje"
-msgid "Organic"
-msgstr "Biologische winkel"
-
msgid "Edit Organic/Bio"
msgstr "Organisch/Bio bewerken"
@@ -19671,8 +20682,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"
@@ -19692,14 +20703,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"
@@ -19707,7 +20718,6 @@ msgstr "Hifi"
msgid "Edit Hifi Shop"
msgstr "Hifi-winkel bewerken"
-msgctxt "shop"
msgid "Video"
msgstr "Videotheek"
@@ -19735,6 +20745,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"
@@ -19771,11 +20787,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"
@@ -19804,7 +20841,7 @@ msgstr "Bouwmarkt bewerken"
msgid "Paint"
msgstr "Verfwinkel"
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr "Verfwinkel bewerken"
msgid "Furniture"
@@ -19816,20 +20853,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"
@@ -19864,8 +20901,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"
@@ -20077,6 +21114,12 @@ msgstr "Bergtop"
msgid "Edit Peak"
msgstr "Bergtop bewerken"
+msgid "Saddle"
+msgstr "Zadel"
+
+msgid "Edit Saddle"
+msgstr "Zadel bewerken"
+
msgid "Glacier"
msgstr "Gletsjer"
@@ -20116,24 +21159,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"
@@ -20143,15 +21195,6 @@ 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"
@@ -20227,6 +21270,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"
@@ -20281,7 +21330,7 @@ msgstr "Recreatiegebied"
msgid "Edit Recreation Ground Landuse"
msgstr "Recreatiegebied bewerken"
-msgid "Residential area"
+msgid "Residential Area"
msgstr "Woongebied"
msgid "Edit Residential Landuse"
@@ -20293,6 +21342,9 @@ msgstr "Begraafplaats"
msgid "Edit Graveyard"
msgstr "Begraafplaats bewerken"
+msgid "shinto"
+msgstr "shinto"
+
msgid "Cemetery"
msgstr "Begraafplaats"
@@ -20368,6 +21420,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"
@@ -20404,6 +21483,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)"
@@ -20572,21 +21663,50 @@ msgstr "Algemene route"
msgid "Edit general route"
msgstr "Algemene route bewerken"
+msgctxt "route type"
+msgid "bicycle"
+msgstr "fiets"
+
+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"
@@ -20632,20 +21752,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"
@@ -20668,8 +21791,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)"
@@ -20764,18 +21887,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"
@@ -20785,8 +21917,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"
@@ -20794,11 +21929,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"
@@ -20815,6 +21950,9 @@ msgstr "stroomversnelling"
msgid "railwaypoint"
msgstr "spoorwegpunt"
+msgid "raildashed"
+msgstr "spoorstreepjes"
+
msgid "railyard"
msgstr "rangeerterrein"
@@ -20830,29 +21968,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"
@@ -20872,20 +22010,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"
@@ -20959,11 +22097,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"
@@ -20977,9 +22118,6 @@ msgstr "Dorp/stad"
msgid "One Way"
msgstr "Eénrichting"
-msgid "Church"
-msgstr "Kerk"
-
msgid "Fuel Station"
msgstr "Tankstation"
@@ -21007,6 +22145,9 @@ msgstr "brugtag op een knoop"
msgid "wrong highway tag on a node"
msgstr "verkeerde snelwegtag op een knoop"
+msgid "wrong crossing tag on a way"
+msgstr "verkeerde tag kruising op weg"
+
msgid "Unnamed unclassified highway"
msgstr "Naamloze niet-geclassificeerde snelweg"
@@ -21052,11 +22193,41 @@ msgstr "ongewone tagcombinatie (snelweg & waterweg)"
msgid "unusual tag combination (highway & natural)"
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 "natuurlijk water gebruikt als zwembad"
-msgid "incline without highway"
-msgstr "afbuiging zonder weg"
+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 "kruising zonder weg"
@@ -21067,8 +22238,8 @@ msgstr "rijstroken zonder weg"
msgid "lcn without highway"
msgstr "lcn zonder weg"
-msgid "lit without highway"
-msgstr "lit zonder weg"
+msgid "lit without highway/railway/piste/parking/platform"
+msgstr "lit zonder highway/railway/piste/parking/platform"
msgid "living_street without highway"
msgstr "woon_straat zonder weg"
@@ -21085,8 +22256,8 @@ msgstr "motorweg zonder weg"
msgid "ntd_id without highway"
msgstr "ntd_id zonder weg"
-msgid "oneway without highway"
-msgstr "eenrichting zonder weg"
+msgid "oneway without highway or railway"
+msgstr "oneway zonder highway of railway"
msgid "sac_scale without highway"
msgstr "sac_scale zonder weg"
@@ -21202,20 +22373,131 @@ msgstr "kanaal zonder waterweg"
msgid "have_riverbank without waterway"
msgstr "heeft_rivieroever zonder waterweg"
-msgid "tunnel without highway/railway/waterway"
-msgstr "tunnel zonder weg/spoorweg/waterweg"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr "tunnel zonder highway/railway/waterway/platform/pipeline"
-msgid "bridge without highway/railway/waterway"
-msgstr "brug zonder weg/spoorweg/waterweg"
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr "bridge zonder highway/railway/waterway/platform/piste/pipeline"
-msgid "psv without highway/railway/waterway"
-msgstr "psv zonder weg/spoorweg/waterweg"
+msgid "psv without highway/railway/waterway/parking"
+msgstr "psv zonder highway/railway/waterway/parking"
msgid "width without physical linear feature"
msgstr "breedte zonder fysiek lineair item"
-msgid "maxspeed without highway/railway/traffic_sign"
-msgstr "maxsnelheid zonder weg/spoorweg/verkeers_teken"
+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 "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 "religie zonder nadere omschrijving"
@@ -21235,9 +22517,59 @@ msgstr ""
"geen taal voor wikipedia opgegeven, gebruik ''wikipedia''=''language:page "
"title''"
-msgid "unkown language prefix in wikipedia tag"
+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 "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"
@@ -21247,20 +22579,29 @@ 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)"
-msgid "Skobbler"
-msgstr "Skobbler"
+msgid "skobbler"
+msgstr "skobbler"
+
+msgid "skobbler heatmap"
+msgstr "skobbler heatmap"
msgid "skobbler heatmap"
msgstr "skobbler heatmap"
@@ -21280,8 +22621,8 @@ msgstr "OpenStreetMap (Duitse stijl)"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Cambodja, Laos, Thailand, Vietnam tweetalig"
-msgid "2u"
-msgstr "2u"
+msgid "osmfr"
+msgstr "osmfr"
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI zwart/wit 2.5m"
@@ -21289,6 +22630,9 @@ 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)"
@@ -21437,6 +22781,32 @@ 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)"
@@ -21602,6 +22972,9 @@ msgstr "USGS Large Scale Imagery"
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr "OSM US TIGER 2012 Wegen overlay"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr "Nieuwe & foutief uitgelijnde TIGER Roads (TIGER 2013)"
+
msgid "OSM - Tiger Edited Map"
msgstr "OSM - Tiger Edited Map"
@@ -21629,23 +23002,56 @@ 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 Schotland 1842-82"
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr "NLS - OS 6-inch Schotland 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 historisch (OSM)"
+
+msgid "OS Scottish Popular historic"
+msgstr "OS Scottish Popular historic"
+
+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 exporteren"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Exporteer verkeersgegevens naar SUMO netwerkbestand."
+
+msgid "SUMO Export"
+msgstr "SUMO exporteren"
+
+msgid "Export"
+msgstr "Exporteren"
+
+msgid "Port:"
+msgstr "Poort:"
-msgid "NLS - OS 1:25k 1st Series 1937-61"
-msgstr "NLS - OS 1:25k 1st Series 1937-61"
+msgid "refresh the port list"
+msgstr "Lijst met poorten vernieuwen"
-msgid "NLS - OS 1-inch 7th Series 1955-61"
-msgstr "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Configure"
+msgstr "Configureren"
-msgid "OS 1:25k historic (OSM)"
-msgstr "OS 1:25k historisch (OSM)"
+msgid "Connection Error."
+msgstr "Verbindingsfout."
-msgid "OS Scottish Popular historic"
-msgstr "OS Scottish Popular historic"
+msgid "configure the connected DG100"
+msgstr "De verbonden DG100 configureren"
-msgid "NLS - Bartholomew Half Inch, 1897-1907"
-msgstr "NLS - Bartholomew Half Inch, 1897-1907"
+msgid "delete data after import"
+msgstr "gegevens na importeren verwijderen"
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV-bestanden"
@@ -21859,6 +23265,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."
@@ -21880,14 +23298,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}''."
@@ -22162,11 +23574,14 @@ 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 "Housenumber increment:"
-msgstr "Verhoging huisnummer"
+msgid "House number increment:"
+msgstr "Verhoging huisnummers:"
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
@@ -22376,8 +23791,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"
@@ -22757,15 +24172,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"
@@ -22924,7 +24330,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"
@@ -22956,6 +24362,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."
@@ -22975,12 +24384,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "hoog"
-
-msgid "medium"
-msgstr "medium"
-
msgid "symbol"
msgstr "symbool"
@@ -23135,6 +24538,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:"
@@ -23156,6 +24564,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?"
@@ -23405,8 +24816,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."
@@ -23458,7 +24872,7 @@ msgstr "Verwijder het geselecteerde schema uit de lijst."
msgid "Color Schemes"
msgstr "Kleurenschema''s"
-msgid "Adress"
+msgid "Address"
msgstr "Adres"
msgid "Split area"
@@ -23649,6 +25063,71 @@ msgstr "Log wissen"
msgid "Show users on map"
msgstr "Gebruikers op kaart weergeven"
+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 "Private chat"
+msgstr "Privé chatten"
+
+msgid "Close tab"
+msgstr "Tabblad sluiten"
+
+msgid "Logout"
+msgstr "Uitloggen"
+
+msgid "Clear log"
+msgstr "Log wissen"
+
+msgid "Show users on map"
+msgstr "Gebruikers op kaart weergeven"
+
msgid "Position only"
msgstr "Alleen positie"
@@ -23688,27 +25167,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."
@@ -23863,7 +25324,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 ""
@@ -24881,9 +26342,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"
@@ -25573,7 +27058,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}''"
@@ -25611,9 +27096,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 "Process queue"
msgstr "Wachtrij om te verwerken"
@@ -25671,18 +27153,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"
@@ -26037,6 +27507,27 @@ msgstr "Test mislukt: Kon geen mtime lezen."
msgid "Test failed: Could not write mtime."
msgstr "Test mislukt: Kon geen mtime schrijven."
+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?"
@@ -26193,6 +27684,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 "
@@ -26342,7 +27837,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 "
@@ -26519,9 +28014,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:"
@@ -26744,6 +28236,10 @@ msgstr ""
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}"
@@ -26780,15 +28276,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:"
@@ -26903,9 +28419,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)"
@@ -27035,7 +28548,7 @@ 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. Uitzondering is: {0}"
+msgstr "Kon geen back-up maken van het bestand. Exceptie is: {0}"
msgid "Simplify Area"
msgstr "Gebied vereenvoudigen"
@@ -27112,20 +28625,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"
@@ -27349,6 +28862,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"
@@ -27391,6 +29001,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..."
@@ -27563,9 +29178,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:"
@@ -27959,10 +29571,10 @@ 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"
@@ -28225,7 +29837,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."
@@ -28720,9 +30332,6 @@ msgstr "Selectie van knopen opheffen"
msgid "Removes all nodes from selection"
msgstr "Alle knopen uit selectie verwijderen"
-msgid "Video"
-msgstr "Videotheek"
-
msgid "Import Video"
msgstr "Video importeren"
@@ -29030,9 +30639,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 f1a3e5a..68a0f76 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-08-04 03:41+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-08-05 04:53+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 ""
@@ -250,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"
@@ -289,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr "Gå til {0}"
@@ -343,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 ""
@@ -523,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -636,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 ""
@@ -786,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"
@@ -972,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 ""
@@ -995,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>"
@@ -1163,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1304,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"
@@ -1399,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 ""
@@ -1683,6 +1703,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1902,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] ""
@@ -2328,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 ""
@@ -2524,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 ""
@@ -2611,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 ""
@@ -2647,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"
@@ -2673,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}''"
@@ -2778,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] ""
@@ -2838,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"
@@ -2869,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"
@@ -2893,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 ""
@@ -2923,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 ""
@@ -2943,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 ""
@@ -2952,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 ""
@@ -2972,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}"
@@ -3003,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}''."
@@ -3160,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 ""
@@ -3268,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 ""
@@ -3306,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3347,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3371,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 ""
@@ -3430,6 +3469,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3512,6 +3554,15 @@ 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 ""
@@ -3581,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 ""
@@ -3638,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})"
@@ -3676,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}"
@@ -3813,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"
@@ -3888,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 ""
@@ -3918,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3945,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''"
@@ -4011,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 ""
@@ -4131,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"
@@ -4360,6 +4400,18 @@ 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 ""
@@ -4464,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 ""
@@ -4764,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"
@@ -4801,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"
@@ -4853,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 ""
@@ -5110,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 ""
@@ -5638,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5721,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 ""
@@ -5811,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 ""
@@ -5982,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 ""
@@ -6269,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"
@@ -6335,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"
@@ -6377,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)"
@@ -6537,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"
@@ -6855,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 ""
@@ -6986,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 ""
@@ -7010,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 ""
@@ -7123,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."
@@ -7222,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7309,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"
@@ -7328,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 ""
@@ -7394,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"
@@ -7470,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 ""
@@ -7485,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"
@@ -7701,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 "
@@ -7715,13 +7795,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7730,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 ""
@@ -7737,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 ..."
@@ -7850,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] ""
@@ -7862,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>"
@@ -7878,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:"
@@ -8024,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8054,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"
@@ -8407,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8428,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 ""
@@ -8485,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8551,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 ""
@@ -8734,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}''..."
@@ -8756,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"
@@ -8766,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:"
@@ -8987,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}''"
@@ -9702,6 +9811,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9770,6 +9912,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9823,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 ""
@@ -10279,6 +10429,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 ""
@@ -10342,7 +10498,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 ""
@@ -10600,40 +10756,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}''"
@@ -10686,8 +10842,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:"
@@ -10696,20 +10852,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 ""
@@ -10791,14 +10952,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,7 +11026,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10950,9 +11105,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10971,6 +11123,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 ""
@@ -11000,9 +11160,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 ""
@@ -11033,7 +11233,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 ""
@@ -11073,28 +11273,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..."
@@ -11189,6 +11387,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11204,12 +11405,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}."
@@ -11288,7 +11497,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11387,35 +11596,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 ""
@@ -11425,8 +11610,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 ..."
@@ -11453,10 +11638,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>"
@@ -11540,8 +11722,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}."
@@ -11738,7 +11920,7 @@ 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}"
@@ -11784,6 +11966,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."
@@ -11814,19 +12005,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 ""
@@ -11848,11 +12039,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 ""
@@ -11922,13 +12125,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}''"
@@ -12071,10 +12274,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"
@@ -12089,22 +12292,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}''"
@@ -12173,8 +12375,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..."
@@ -12189,9 +12390,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}''"
@@ -12513,12 +12729,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12529,30 +12744,73 @@ 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 "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] ""
+
+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"
@@ -12563,9 +12821,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."
@@ -12888,6 +13160,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 ""
@@ -13127,6 +13404,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."
@@ -13176,9 +13456,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 ""
@@ -13215,6 +13492,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 ""
@@ -13345,6 +13627,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13435,6 +13720,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 ""
@@ -13453,10 +13782,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 +13797,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13495,18 +13827,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 ""
@@ -13516,9 +13842,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13528,13 +13851,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13582,6 +13905,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13666,6 +13992,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13770,21 +14099,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 ""
@@ -13800,10 +14138,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"
@@ -13839,7 +14177,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13908,12 +14246,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 ""
@@ -13929,15 +14273,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 ""
@@ -13959,6 +14294,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13968,6 +14312,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13977,10 +14324,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14013,9 +14357,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14058,6 +14399,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14073,6 +14420,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14142,19 +14492,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14185,6 +14529,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14194,10 +14539,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14251,12 +14596,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14317,12 +14656,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14362,9 +14710,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14398,6 +14743,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 ""
@@ -14479,18 +14839,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 ""
@@ -14566,7 +14931,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14590,10 +14955,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"
@@ -14605,9 +14973,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14659,6 +15024,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14671,6 +15039,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14782,11 +15185,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14798,11 +15199,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14821,10 +15220,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14854,9 +15253,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14878,10 +15274,29 @@ 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"
@@ -15031,6 +15446,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15052,6 +15470,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15079,6 +15503,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15103,22 +15533,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 ""
@@ -15140,9 +15554,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15337,6 +15748,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15367,6 +15781,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15379,9 +15796,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15391,9 +15805,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15406,6 +15825,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15430,14 +15852,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15486,7 +15900,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15540,41 +15954,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"
@@ -15766,9 +16180,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15790,9 +16201,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15805,6 +16222,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15844,6 +16264,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15865,22 +16288,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"
@@ -16010,49 +16445,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"
@@ -16070,6 +16499,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16082,6 +16517,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16100,37 +16538,137 @@ 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"
@@ -16220,6 +16758,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 ""
@@ -16301,128 +16845,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16453,16 +17075,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16496,6 +17124,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16533,117 +17164,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 ""
@@ -16677,33 +17344,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 ""
@@ -16737,6 +17414,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 ""
@@ -16837,36 +17530,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 ""
@@ -16909,19 +17620,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 ""
@@ -17060,6 +17767,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 ""
@@ -17072,60 +17791,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 ""
@@ -17350,41 +18143,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"
@@ -17393,7 +18212,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17405,12 +18224,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 ""
@@ -17462,88 +18371,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17555,6 +18567,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 ""
@@ -17570,6 +18597,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17588,11 +18618,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17701,10 +18729,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17716,7 +18744,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17737,6 +18765,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17749,9 +18780,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17821,7 +18849,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17842,13 +18870,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"
@@ -17857,7 +18885,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17885,6 +18912,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17921,10 +18954,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"
@@ -17954,7 +19008,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17966,19 +19020,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"
@@ -18014,7 +19068,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18227,6 +19281,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18266,24 +19326,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 ""
@@ -18293,15 +19362,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18377,6 +19437,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18431,7 +19497,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18443,6 +19509,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18479,43 +19548,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18554,6 +19650,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18722,21 +19830,50 @@ 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 ""
+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 ""
@@ -18782,19 +19919,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"
@@ -18818,7 +19958,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18914,18 +20054,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 ""
@@ -18935,7 +20084,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18944,10 +20096,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18965,6 +20117,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18980,28 +20135,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"
@@ -19022,19 +20177,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"
@@ -19109,10 +20264,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19127,9 +20285,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19157,6 +20312,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19202,10 +20360,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"
@@ -19217,7 +20405,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"
@@ -19235,7 +20423,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19352,19 +20540,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 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"
@@ -19383,7 +20682,46 @@ 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 "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 "Landsat"
@@ -19395,19 +20733,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 "skobbler heatmap"
@@ -19428,7 +20775,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19437,6 +20784,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19583,6 +20933,29 @@ 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 ""
@@ -19748,6 +21121,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19793,6 +21169,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19979,19 +21388,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20015,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}''."
@@ -20284,10 +21699,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20491,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"
@@ -20762,15 +22180,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20941,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 ""
@@ -20959,12 +22371,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21100,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 ""
@@ -21117,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 ""
@@ -21343,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."
@@ -21393,7 +22808,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21578,6 +22993,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21617,27 +23097,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 ""
@@ -22715,9 +24177,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 ""
@@ -23364,9 +24843,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23419,18 +24895,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 ""
@@ -23777,6 +25241,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23928,6 +25413,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 ""
@@ -24245,9 +25733,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24463,6 +25948,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 ""
@@ -24495,15 +25983,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 ""
@@ -24618,9 +26122,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24799,19 +26300,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"
@@ -25027,6 +26528,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 ""
@@ -25063,6 +26653,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..."
@@ -25215,9 +26808,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26203,9 +27793,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26484,9 +28071,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 36471b7..adb28ef 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-08-04 03:41+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-08-05 04:54+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ 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 ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -160,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 "
@@ -255,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"
@@ -294,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}"
@@ -350,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"
@@ -534,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)"
@@ -647,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 ""
@@ -797,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"
@@ -983,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 ""
@@ -1006,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>"
@@ -1174,9 +1172,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1315,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"
@@ -1410,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"
@@ -1694,6 +1710,9 @@ 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))"
@@ -1913,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] ""
@@ -2339,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 ""
@@ -2535,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 ""
@@ -2622,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 ""
@@ -2658,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"
@@ -2684,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}''"
@@ -2789,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] ""
@@ -2849,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"
@@ -2880,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 ""
@@ -2904,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 ""
@@ -2934,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 ""
@@ -2954,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 ""
@@ -2963,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 ""
@@ -2983,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}"
@@ -3014,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}''."
@@ -3171,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 ""
@@ -3279,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 ""
@@ -3317,9 +3343,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3358,6 +3381,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3382,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 ""
@@ -3441,6 +3476,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3523,6 +3561,15 @@ 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 ""
@@ -3592,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 ""
@@ -3649,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})"
@@ -3687,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}"
@@ -3824,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"
@@ -3899,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 ""
@@ -3929,9 +3985,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3956,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''"
@@ -4022,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 ""
@@ -4142,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"
@@ -4371,6 +4407,18 @@ 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"
@@ -4475,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 ""
@@ -4775,29 +4810,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"
@@ -4812,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"
@@ -4864,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 ""
@@ -5121,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 ""
@@ -5649,6 +5694,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5732,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"
@@ -5822,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 ""
@@ -5993,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 ""
@@ -6280,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"
@@ -6346,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"
@@ -6388,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)"
@@ -6548,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"
@@ -6866,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"
@@ -6997,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, "
@@ -7021,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 ""
@@ -7134,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."
@@ -7233,6 +7308,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7320,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"
@@ -7339,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 ""
@@ -7405,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"
@@ -7481,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 ""
@@ -7496,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"
@@ -7712,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 "
@@ -7726,10 +7802,26 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 ""
+
+msgid "Cancel and return to the previous dialog"
msgstr ""
msgid "Do not show this message again"
@@ -7741,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 ""
@@ -7748,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 ..."
@@ -7861,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] ""
@@ -7873,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>"
@@ -7889,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:"
@@ -8035,7 +8142,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8065,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"
@@ -8418,9 +8525,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8439,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 ""
@@ -8496,6 +8603,12 @@ msgstr "Seguent"
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8566,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 ""
@@ -8749,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}''..."
@@ -8771,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"
@@ -8781,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:"
@@ -9002,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}''"
@@ -9717,6 +9822,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9785,6 +9923,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9838,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 ""
@@ -10294,6 +10440,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 ""
@@ -10357,7 +10509,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 ""
@@ -10615,40 +10767,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}''"
@@ -10701,8 +10853,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:"
@@ -10711,20 +10863,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 ""
@@ -10806,14 +10963,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"
@@ -10886,7 +11037,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10965,9 +11116,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10986,6 +11134,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 ""
@@ -11015,9 +11171,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 ""
@@ -11048,7 +11244,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 ""
@@ -11088,28 +11284,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..."
@@ -11204,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 ""
@@ -11219,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}."
@@ -11303,7 +11508,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11402,35 +11607,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 ""
@@ -11440,8 +11621,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 ..."
@@ -11468,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>"
@@ -11555,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}."
@@ -11753,7 +11931,7 @@ 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}"
@@ -11799,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."
@@ -11829,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 ""
@@ -11863,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 ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11937,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}''"
@@ -12086,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"
@@ -12104,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}''"
@@ -12188,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..."
@@ -12204,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}''"
@@ -12528,12 +12740,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12544,18 +12755,61 @@ 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 "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 ""
+
+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:"
@@ -12578,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."
@@ -12903,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 ""
@@ -13142,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."
@@ -13191,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 ""
@@ -13230,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 ""
@@ -13360,6 +13638,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13450,6 +13731,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 ""
@@ -13468,10 +13793,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13483,6 +13808,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13510,18 +13838,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 ""
@@ -13531,9 +13853,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13543,13 +13862,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13597,6 +13916,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13681,6 +14003,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13785,21 +14110,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 ""
@@ -13815,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"
@@ -13854,7 +14188,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13923,12 +14257,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 ""
@@ -13944,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 ""
@@ -13974,6 +14305,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13983,6 +14323,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13992,10 +14335,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14028,9 +14368,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14073,6 +14410,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14088,6 +14431,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14157,19 +14503,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14200,6 +14540,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14209,10 +14550,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14266,12 +14607,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14332,12 +14667,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14377,9 +14721,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14413,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 ""
@@ -14494,18 +14850,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 ""
@@ -14581,7 +14942,7 @@ msgstr "torisme"
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14605,10 +14966,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"
@@ -14620,9 +14984,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14674,6 +15035,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14686,18 +15050,32 @@ 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 ""
@@ -14797,11 +15175,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14813,11 +15189,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14836,10 +15210,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14869,9 +15243,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14893,10 +15264,29 @@ 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"
@@ -15046,6 +15436,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15067,6 +15460,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15094,6 +15493,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15118,22 +15523,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 ""
@@ -15155,9 +15544,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15352,6 +15738,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15382,6 +15771,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15394,9 +15786,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15406,9 +15795,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15421,6 +15815,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15445,14 +15842,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15501,7 +15890,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15555,41 +15944,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"
@@ -15781,9 +16170,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15805,9 +16191,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15820,6 +16212,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15859,6 +16254,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15880,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"
@@ -16025,49 +16435,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"
-msgstr ""
+msgid "Church"
+msgstr "Glèisa"
-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"
@@ -16085,6 +16489,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16097,6 +16507,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16115,37 +16528,137 @@ 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"
@@ -16235,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 ""
@@ -16316,12 +16835,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+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 ""
@@ -16331,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 ""
@@ -16340,31 +16937,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 ""
@@ -16392,7 +16995,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16419,21 +17022,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 "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16468,16 +17065,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16511,6 +17114,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16548,117 +17154,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 ""
@@ -16692,33 +17334,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 ""
@@ -16752,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 ""
@@ -16852,36 +17520,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 ""
@@ -16924,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 ""
@@ -17075,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 ""
@@ -17087,487 +17781,795 @@ 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 ""
msgid "Edit Tower"
msgstr ""
-msgid "Tower type"
+msgid "Tower type"
+msgstr ""
+
+msgid "communication"
+msgstr ""
+
+msgid "observation"
+msgstr ""
+
+msgid "Flagpole"
+msgstr ""
+
+msgid "Works"
+msgstr ""
+
+msgid "Edit Works"
+msgstr ""
+
+msgid "Chimney"
+msgstr ""
+
+msgid "Edit Chimney"
+msgstr ""
+
+msgid "Windmill"
+msgstr ""
+
+msgid "Edit Windmill"
+msgstr ""
+
+msgid "Gasometer"
+msgstr ""
+
+msgid "Edit Gasometer"
+msgstr ""
+
+msgid "Pipeline"
+msgstr ""
+
+msgid "Edit Pipeline"
+msgstr ""
+
+msgid "water"
+msgstr ""
+
+msgid "gas"
+msgstr ""
+
+msgid "heat"
+msgstr ""
+
+msgid "oil"
+msgstr ""
+
+msgid "sewage"
+msgstr ""
+
+msgid "Location"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "underwater"
+msgstr ""
+
+msgctxt "pipeline"
+msgid "overground"
+msgstr ""
+
+msgid "Crane"
+msgstr ""
+
+msgid "Edit Crane"
+msgstr ""
+
+msgid "Mineshaft"
+msgstr ""
+
+msgid "Edit Mineshaft"
+msgstr ""
+
+msgid "Function"
+msgstr ""
+
+msgid "winding"
+msgstr ""
+
+msgid "air"
+msgstr ""
+
+msgid "Depth in meters"
+msgstr ""
+
+msgid "Resource"
+msgstr ""
+
+msgid "aggregate"
+msgstr ""
+
+msgid "bauxite"
+msgstr ""
+
+msgid "coal"
+msgstr ""
+
+msgid "copper"
+msgstr ""
+
+msgid "dimension_stone"
+msgstr ""
+
+msgid "gold"
+msgstr ""
+
+msgid "ilmenite"
+msgstr ""
+
+msgid "iron_ore"
+msgstr ""
+
+msgid "lead"
+msgstr ""
+
+msgid "limestone"
+msgstr ""
+
+msgid "nickel"
+msgstr ""
+
+msgid "rutile"
+msgstr ""
+
+msgid "salt"
+msgstr ""
+
+msgid "silver"
+msgstr ""
+
+msgid "tin"
+msgstr ""
+
+msgid "zinc"
+msgstr ""
+
+msgid "zircon"
+msgstr ""
+
+msgid "Visible Headframe"
+msgstr ""
+
+msgid "Disused"
+msgstr ""
+
+msgid "Adit"
+msgstr ""
+
+msgid "Edit Adit"
+msgstr ""
+
+msgid "Length in meters"
+msgstr ""
+
+msgid "Water Tower"
+msgstr ""
+
+msgid "Edit Water Tower"
+msgstr ""
+
+msgid "Water Works"
+msgstr ""
+
+msgid "Edit Water Works"
+msgstr ""
+
+msgid "Wastewater Plant"
+msgstr ""
+
+msgid "Edit Wastewater Plant"
+msgstr ""
+
+msgid "Watermill"
+msgstr ""
+
+msgid "Edit Watermill"
+msgstr ""
+
+msgid "Fountain"
+msgstr ""
+
+msgid "Edit Fountain"
+msgstr ""
+
+msgid "Water Well"
+msgstr ""
+
+msgid "Edit Water Well"
+msgstr ""
+
+msgid "Lighthouse"
+msgstr ""
+
+msgid "Edit Lighthouse"
+msgstr ""
+
+msgid "Edit Beacon"
+msgstr ""
+
+msgid "Street Lamp"
+msgstr ""
+
+msgid "Edit Street Lamp"
+msgstr ""
+
+msgid "Operation times"
+msgstr ""
+
+msgid "Mo-Fr 22:00-05:00"
+msgstr ""
+
+msgid "Monitoring Station"
+msgstr ""
+
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "communication"
+msgid "Monitoring:"
msgstr ""
-msgid "observation"
+msgid "Weather"
msgstr ""
-msgid "Flagpole"
+msgid "Water level"
msgstr ""
-msgid "Works"
+msgid "Tide Level"
msgstr ""
-msgid "Edit Works"
+msgid "Traffic"
msgstr ""
-msgid "Chimney"
+msgid "Air Quality"
msgstr ""
-msgid "Edit Chimney"
+msgid "Noise"
msgstr ""
-msgid "Windmill"
+msgid "GPS Signals"
msgstr ""
-msgid "Edit Windmill"
+msgid "GLONASS Signals"
msgstr ""
-msgid "Gasometer"
+msgid "Galileo Signals"
msgstr ""
-msgid "Edit Gasometer"
+msgid "Radiation"
msgstr ""
-msgid "Pipeline"
+msgid "Seismic Activity"
msgstr ""
-msgid "Edit Pipeline"
+msgid "Recording:"
msgstr ""
-msgid "water"
+msgid "Automated"
msgstr ""
-msgid "gas"
+msgid "Manually"
msgstr ""
-msgid "heat"
+msgid "Remote"
msgstr ""
-msgid "oil"
+msgid "Display:"
msgstr ""
-msgid "sewage"
+msgid "Analog"
msgstr ""
-msgid "Location"
+msgid "Digital"
msgstr ""
-msgctxt "pipeline"
-msgid "underwater"
+msgid "Survey Point"
msgstr ""
-msgctxt "pipeline"
-msgid "overground"
+msgid "Edit Survey Point"
msgstr ""
-msgid "Crane"
+msgid "Surveillance Camera"
msgstr ""
-msgid "Edit Crane"
+msgid "Edit Surveillance Camera"
msgstr ""
-msgid "Mineshaft"
+msgid "indoor"
msgstr ""
-msgid "Edit Mineshaft"
+msgid "outdoor"
msgstr ""
-msgid "Function"
+msgid "Zone"
msgstr ""
-msgid "winding"
+msgid "parking"
msgstr ""
-msgid "air"
+msgid "traffic"
msgstr ""
-msgid "Depth in meters"
+msgid "shop"
+msgstr "botiga"
+
+msgid "bank"
msgstr ""
-msgid "Resource"
+msgid "Camera"
msgstr ""
-msgid "aggregate"
+msgid "fixed"
msgstr ""
-msgid "bauxite"
+msgid "panning"
msgstr ""
-msgid "coal"
+msgid "dome"
msgstr ""
-msgid "copper"
+msgid "Mounted on"
msgstr ""
-msgid "dimension_stone"
+msgid "ceiling"
msgstr ""
-msgid "gold"
+msgid "Direction in degrees"
msgstr ""
-msgid "ilmenite"
+msgid "Inclination in degrees"
msgstr ""
-msgid "iron_ore"
+msgid "Height in meter (m)"
msgstr ""
-msgid "lead"
+msgid "Power"
msgstr ""
-msgid "limestone"
+msgid "Power Plant"
msgstr ""
-msgid "nickel"
+msgid "Edit Power Plant"
msgstr ""
-msgid "rutile"
+msgid "Start date"
msgstr ""
-msgid "salt"
+msgid "Output forms of energy"
msgstr ""
-msgid "silver"
+msgid "(please add this information to the generators if possible)"
msgstr ""
-msgid "tin"
+msgid "electricity"
msgstr ""
-msgid "zinc"
+msgid "2 W"
msgstr ""
-msgid "zircon"
+msgid "3 kW"
msgstr ""
-msgid "Visible Headframe"
+msgid "5 MW"
msgstr ""
-msgid "Disused"
+msgid "7 GW"
msgstr ""
-msgid "Adit"
+msgid "hot water"
msgstr ""
-msgid "Edit Adit"
+msgid "hot air"
msgstr ""
-msgid "Length in meters"
+msgid "cold water"
msgstr ""
-msgid "Water Tower"
+msgid "cold air"
msgstr ""
-msgid "Edit Water Tower"
+msgid "compressed air"
msgstr ""
-msgid "Water Works"
+msgid "steam"
msgstr ""
-msgid "Edit Water Works"
+msgid "vacuum"
msgstr ""
-msgid "Wastewater Plant"
+msgid "Power Generator"
msgstr ""
-msgid "Edit Wastewater Plant"
+msgid "Edit Power Generator"
msgstr ""
-msgid "Watermill"
+msgid "biofuel"
msgstr ""
-msgid "Edit Watermill"
+msgid "biogas"
msgstr ""
-msgid "Fountain"
+msgid "biomass"
msgstr ""
-msgid "Edit Fountain"
+msgid "diesel"
msgstr ""
-msgid "Water Well"
+msgid "gasoline"
msgstr ""
-msgid "Edit Water Well"
+msgid "geothermal"
msgstr ""
-msgid "Lighthouse"
+msgid "hydro"
msgstr ""
-msgid "Edit Lighthouse"
+msgid "nuclear"
msgstr ""
-msgid "Edit Beacon"
+msgid "osmotic"
msgstr ""
-msgid "Street Lamp"
+msgid "solar"
msgstr ""
-msgid "Edit Street Lamp"
+msgid "tidal"
msgstr ""
-msgid "Operation times"
+msgid "waste"
msgstr ""
-msgid "Mo-Fr 22:00-05:00"
+msgid "wave"
msgstr ""
-msgid "Measurement Station"
+msgid "wind"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Method"
msgstr ""
-msgid "Measurement"
+msgctxt "generator method"
+msgid "anaerobic_digestion"
msgstr ""
-msgid "particulate_matter"
+msgctxt "generator method"
+msgid "barrage"
msgstr ""
-msgid "seismic"
+msgctxt "generator method"
+msgid "combustion"
msgstr ""
-msgid "water_level"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
-msgid "weather"
+msgctxt "generator method"
+msgid "fission"
msgstr ""
-msgid "Recording"
+msgctxt "generator method"
+msgid "fusion"
msgstr ""
-msgid "manually"
+msgctxt "generator method"
+msgid "gasification"
msgstr ""
-msgid "automated"
+msgid "biomass / waste"
msgstr ""
-msgid "remote"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgctxt "generator method"
+msgid "pyrolysis"
msgstr ""
-msgid "Survey Point"
+msgctxt "generator method"
+msgid "run-of-the-river"
msgstr ""
-msgid "Edit Survey Point"
+msgctxt "generator method"
+msgid "stream"
msgstr ""
-msgid "Surveillance"
+msgctxt "generator method"
+msgid "thermal"
msgstr ""
-msgid "Edit Surveillance Camera"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "indoor"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "outdoor"
+msgid "Generator Type"
msgstr ""
-msgid "public"
+msgid "combined_cycle"
msgstr ""
-msgid "Power"
+msgid "gas combustion"
msgstr ""
-msgid "Power Generator"
+msgid "francis_turbine"
msgstr ""
-msgid "Edit Power Generator"
+msgid "gas_turbine"
msgstr ""
-msgid "biofuel"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "biogas"
+msgid "heat_pump"
msgstr ""
-msgid "biomass"
+msgid "horizontal_axis"
msgstr ""
-msgid "diesel"
+msgid "tidal steam / wind"
msgstr ""
-msgid "gasoline"
+msgid "kaplan_turbine"
msgstr ""
-msgid "geothermal"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
msgstr ""
-msgid "hydro"
+msgid "pelton_turbine"
msgstr ""
-msgid "nuclear"
+msgid "hygro run-of-the-river / hydro water-storage"
msgstr ""
-msgid "osmotic"
+msgid "reciprocating_engine"
msgstr ""
-msgid "solar"
+msgid "biofuel, biogas, diesel, gas, gasoline"
msgstr ""
-msgid "tidal"
+msgid "solar_photovoltaic_panel"
msgstr ""
-msgid "waste"
+msgid "solar photovoltaic"
msgstr ""
-msgid "wave"
+msgid "solar_thermal_collector"
msgstr ""
-msgid "wind"
+msgid "solar thermal"
msgstr ""
-msgid "Method"
+msgid "steam_generator"
msgstr ""
-msgid "anaerobic_digestion"
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
msgstr ""
-msgid "combustion"
+msgid "steam_turbine"
msgstr ""
-msgid "dam"
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
msgstr ""
-msgid "fission"
+msgid "stellarator"
msgstr ""
-msgid "fusion"
+msgid "nuclear fusion"
msgstr ""
-msgid "gasification"
+msgid "tokamak"
msgstr ""
-msgid "photovoltaic"
+msgid "vertical_axis"
msgstr ""
-msgid "pumped-storage"
+msgid "Boiling Water Reactor 1 (BWR-1)"
msgstr ""
-msgid "pumping"
+msgid "nuclear fission"
msgstr ""
-msgid "pyrolysis"
+msgid "Boiling Water Reactor 2 (BWR-2)"
msgstr ""
-msgid "run-of-the-river"
+msgid "Boiling Water Reactor 3 (BWR-3)"
msgstr ""
-msgid "thermal"
+msgid "Boiling Water Reactor 4 (BWR-4)"
msgstr ""
-msgid "Output forms of energy"
+msgid "Boiling Water Reactor 5 (BWR-5)"
msgstr ""
-msgid "electricity"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "2 W"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "3 kW"
+msgid "China Pressurized Reactor (CPR-1000)"
msgstr ""
-msgid "5 MW"
+msgid "European Pressurized Reactor (EPR)"
msgstr ""
-msgid "7 GW"
+msgid "Inertial Confinement Fusion (ICF)"
msgstr ""
-msgid "hot water"
+msgid "Pressurized water reactor (PWR)"
msgstr ""
-msgid "hot air"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "cold water"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "cold air"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "compressed air"
+msgid "Output forms of energy:"
msgstr ""
-msgid "steam"
+msgid "Power Sub Station"
msgstr ""
-msgid "vacuum"
+msgid "Edit Power Sub Station"
msgstr ""
-msgid "battery charging"
+msgid "Line reference"
msgstr ""
-msgid "Power Station"
+msgid "high"
msgstr ""
-msgid "Edit Power Station"
+msgid "medium"
msgstr ""
-msgid "Power Sub Station"
+msgid "low"
msgstr ""
-msgid "Edit Power Sub Station"
+msgid "750000;200000"
msgstr ""
-msgid "Line reference"
+msgid "110000;20000"
msgstr ""
msgid "Cable Distribution Cabinet"
@@ -17585,6 +18587,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17603,11 +18608,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17716,10 +18719,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17731,7 +18734,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17752,6 +18755,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17764,9 +18770,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17836,7 +18839,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17857,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"
@@ -17872,7 +18875,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17900,6 +18902,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17936,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"
@@ -17969,7 +18998,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17981,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"
@@ -18029,7 +19058,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18242,6 +19271,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18281,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 ""
@@ -18308,15 +19352,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18392,6 +19427,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18446,7 +19487,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18458,6 +19499,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18530,7 +19574,34 @@ msgstr ""
msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Annotation"
+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"
@@ -18569,6 +19640,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18737,21 +19820,50 @@ 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 ""
+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 ""
@@ -18797,19 +19909,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"
@@ -18833,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)"
@@ -18929,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 "pont"
msgid "deprecated"
msgstr "depreciat"
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr "camin equèstre"
@@ -18950,8 +20074,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 ""
@@ -18959,11 +20086,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 ""
@@ -18980,6 +20107,9 @@ msgstr "rapids"
msgid "railwaypoint"
msgstr "gara / arrèst ferroviari"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18995,29 +20125,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"
@@ -19037,20 +20167,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á"
@@ -19124,11 +20254,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 ""
@@ -19142,9 +20275,6 @@ msgstr "Vilatge / Vila"
msgid "One Way"
msgstr "Sens unic"
-msgid "Church"
-msgstr "Glèisa"
-
msgid "Fuel Station"
msgstr ""
@@ -19172,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 ""
@@ -19217,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"
@@ -19232,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"
@@ -19250,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"
@@ -19367,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"
+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 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"
@@ -19398,7 +20672,46 @@ 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 "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 "Landsat"
@@ -19410,19 +20723,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 "skobbler heatmap"
@@ -19443,7 +20765,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19452,6 +20774,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19598,6 +20923,29 @@ 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 ""
@@ -19763,6 +21111,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19808,6 +21159,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19994,19 +21378,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20030,13 +21426,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20299,10 +21689,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20506,7 +21899,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"
@@ -20777,15 +22170,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20956,6 +22340,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 ""
@@ -20974,12 +22361,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21115,6 +22496,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 ""
@@ -21132,6 +22516,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 ""
@@ -21358,7 +22745,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."
@@ -21408,7 +22798,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21593,6 +22983,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21632,27 +23087,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 ""
@@ -22730,9 +24167,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 ""
@@ -23379,9 +24833,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23434,18 +24885,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 ""
@@ -23792,6 +25231,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23943,6 +25403,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 ""
@@ -24260,9 +25723,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24478,6 +25938,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 ""
@@ -24510,15 +25973,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 ""
@@ -24633,9 +26112,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24814,19 +26290,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"
@@ -25042,6 +26518,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,6 +26643,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..."
@@ -25230,9 +26798,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26218,9 +27783,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26499,9 +28061,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 f75c2ea..bf537d2 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-08-04 03:41+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-08-05 04:54+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 ""
@@ -250,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -289,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -343,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 ""
@@ -523,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -636,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 ""
@@ -786,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"
@@ -972,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 ""
@@ -995,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>"
@@ -1163,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1304,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"
@@ -1399,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 ""
@@ -1683,6 +1703,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1902,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] ""
@@ -2328,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 ""
@@ -2524,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 ""
@@ -2611,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 ""
@@ -2647,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"
@@ -2673,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}''"
@@ -2778,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] ""
@@ -2838,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"
@@ -2869,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"
@@ -2893,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 ""
@@ -2923,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 ""
@@ -2943,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 ""
@@ -2952,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 ""
@@ -2972,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}"
@@ -3003,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}''."
@@ -3160,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 ""
@@ -3268,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 ""
@@ -3306,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3347,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3371,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 ""
@@ -3430,6 +3469,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3512,6 +3554,15 @@ 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 ""
@@ -3581,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 ""
@@ -3638,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})"
@@ -3676,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}"
@@ -3813,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"
@@ -3888,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 ""
@@ -3918,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3945,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''"
@@ -4011,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 ""
@@ -4131,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"
@@ -4360,6 +4400,18 @@ 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 ""
@@ -4464,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 ""
@@ -4764,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"
@@ -4801,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"
@@ -4853,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 ""
@@ -5110,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 ""
@@ -5638,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5721,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 ""
@@ -5811,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 ""
@@ -5982,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 ""
@@ -6269,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"
@@ -6335,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"
@@ -6377,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)"
@@ -6537,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"
@@ -6855,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 ""
@@ -6986,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 ""
@@ -7010,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 ""
@@ -7123,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."
@@ -7222,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7309,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"
@@ -7328,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 ""
@@ -7394,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"
@@ -7470,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 ""
@@ -7485,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"
@@ -7701,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 "
@@ -7715,13 +7795,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7730,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 ""
@@ -7737,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 ..."
@@ -7850,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] ""
@@ -7862,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>"
@@ -7878,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:"
@@ -8024,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8054,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"
@@ -8407,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8428,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 ""
@@ -8485,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8551,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 ""
@@ -8734,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}''..."
@@ -8756,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"
@@ -8766,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:"
@@ -8987,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}''"
@@ -9702,6 +9811,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9770,6 +9912,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9823,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 ""
@@ -10279,6 +10429,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 ""
@@ -10342,7 +10498,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 ""
@@ -10600,40 +10756,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}''"
@@ -10686,8 +10842,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:"
@@ -10696,20 +10852,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 ""
@@ -10791,14 +10952,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,7 +11026,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10950,9 +11105,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10971,6 +11123,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 ""
@@ -11000,9 +11160,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 ""
@@ -11033,7 +11233,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 ""
@@ -11073,28 +11273,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..."
@@ -11189,6 +11387,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11204,12 +11405,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}."
@@ -11288,7 +11497,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11387,35 +11596,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 ""
@@ -11425,8 +11610,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 ..."
@@ -11453,10 +11638,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>"
@@ -11540,8 +11722,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}."
@@ -11738,7 +11920,7 @@ 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}"
@@ -11784,6 +11966,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."
@@ -11814,19 +12005,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 ""
@@ -11848,11 +12039,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 ""
@@ -11922,13 +12125,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}''"
@@ -12071,10 +12274,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"
@@ -12089,22 +12292,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}''"
@@ -12173,8 +12375,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..."
@@ -12189,9 +12390,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}''"
@@ -12513,12 +12729,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12529,30 +12744,73 @@ 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 "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] ""
+
+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"
@@ -12563,9 +12821,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."
@@ -12888,6 +13160,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 ""
@@ -13127,6 +13404,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."
@@ -13176,9 +13456,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 ""
@@ -13215,6 +13492,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 ""
@@ -13345,6 +13627,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13435,6 +13720,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 ""
@@ -13453,10 +13782,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 +13797,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13495,18 +13827,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 ""
@@ -13516,9 +13842,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13528,13 +13851,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13582,6 +13905,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13666,6 +13992,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13770,21 +14099,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 ""
@@ -13800,10 +14138,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"
@@ -13839,7 +14177,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13908,12 +14246,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 ""
@@ -13929,15 +14273,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 ""
@@ -13959,6 +14294,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13968,6 +14312,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13977,10 +14324,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14013,9 +14357,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14058,6 +14399,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14073,6 +14420,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14142,19 +14492,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14185,6 +14529,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14194,10 +14539,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14251,12 +14596,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14317,12 +14656,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14362,9 +14710,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14398,6 +14743,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 ""
@@ -14479,18 +14839,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 ""
@@ -14566,7 +14931,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14590,10 +14955,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"
@@ -14605,9 +14973,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14659,6 +15024,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14671,6 +15039,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14782,11 +15185,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14798,11 +15199,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14821,10 +15220,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14854,9 +15253,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14878,10 +15274,29 @@ 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"
@@ -15031,6 +15446,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15052,6 +15470,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15079,6 +15503,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15103,22 +15533,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 ""
@@ -15140,9 +15554,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15337,6 +15748,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15367,6 +15781,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15379,9 +15796,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15391,9 +15805,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15406,6 +15825,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15430,14 +15852,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15486,7 +15900,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15540,41 +15954,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"
@@ -15766,9 +16180,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15790,9 +16201,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15805,6 +16222,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15844,6 +16264,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15865,22 +16288,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"
@@ -16010,49 +16445,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"
@@ -16070,6 +16499,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16082,6 +16517,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16100,37 +16538,137 @@ 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"
@@ -16220,6 +16758,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 ""
@@ -16301,128 +16845,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16453,16 +17075,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16496,6 +17124,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16533,117 +17164,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 ""
@@ -16677,33 +17344,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 ""
@@ -16737,6 +17414,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 ""
@@ -16837,36 +17530,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 ""
@@ -16909,19 +17620,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 ""
@@ -17060,6 +17767,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 ""
@@ -17072,60 +17791,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 ""
@@ -17350,41 +18143,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"
@@ -17393,7 +18212,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17405,12 +18224,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 ""
@@ -17462,88 +18371,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17555,6 +18567,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 ""
@@ -17570,6 +18597,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17588,11 +18618,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17701,10 +18729,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17716,7 +18744,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17737,6 +18765,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17749,9 +18780,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17821,7 +18849,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17842,13 +18870,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"
@@ -17857,7 +18885,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17885,6 +18912,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17921,10 +18954,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"
@@ -17954,7 +19008,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17966,19 +19020,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"
@@ -18014,7 +19068,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18227,6 +19281,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18266,24 +19326,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 ""
@@ -18293,15 +19362,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18377,6 +19437,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18431,7 +19497,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18443,6 +19509,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18479,43 +19548,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18554,6 +19650,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18722,21 +19830,50 @@ 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 ""
+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 ""
@@ -18782,19 +19919,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"
@@ -18818,7 +19958,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18914,18 +20054,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 ""
@@ -18935,7 +20084,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18944,10 +20096,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18965,6 +20117,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18980,28 +20135,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"
@@ -19022,19 +20177,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"
@@ -19109,10 +20264,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19127,9 +20285,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19157,6 +20312,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19202,10 +20360,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"
@@ -19217,7 +20405,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"
@@ -19235,7 +20423,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19352,19 +20540,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 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"
@@ -19383,7 +20682,46 @@ 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 "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 "Landsat"
@@ -19395,19 +20733,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 "skobbler heatmap"
@@ -19428,7 +20775,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19437,6 +20784,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19583,6 +20933,29 @@ 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 ""
@@ -19748,6 +21121,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19793,6 +21169,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19979,19 +21388,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20015,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}''."
@@ -20284,10 +21699,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20491,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"
@@ -20762,15 +22180,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20941,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 ""
@@ -20959,12 +22371,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21100,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 ""
@@ -21117,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 ""
@@ -21343,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."
@@ -21393,7 +22808,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21578,6 +22993,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21617,27 +23097,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 ""
@@ -22715,9 +24177,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 ""
@@ -23364,9 +24843,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23419,18 +24895,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 ""
@@ -23777,6 +25241,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23928,6 +25413,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 ""
@@ -24245,9 +25733,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24463,6 +25948,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 ""
@@ -24495,15 +25983,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 ""
@@ -24618,9 +26122,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24799,19 +26300,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"
@@ -25027,6 +26528,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 ""
@@ -25063,6 +26653,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..."
@@ -25215,9 +26808,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26203,9 +27793,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26484,9 +28071,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 0d17a7f..e34c0dd 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-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-08-24 09:05+0000\n"
-"Last-Translator: Rafał Rudzik <rrudzik at gmail.com>\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-08-25 04:32+0000\n"
-"X-Generator: Launchpad (build 16738)\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"
@@ -83,6 +83,9 @@ msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
"Połączenie do otworzenia nie jest obsługiwane na tej platformie (\"{0}\")"
+msgid "ERROR: {0}"
+msgstr "BŁĄD: {0}"
+
msgid "WARNING: {0}"
msgstr "OSTRZEŻENIE: {0}"
@@ -92,6 +95,9 @@ msgstr "INFO: {0}"
msgid "DEBUG: {0}"
msgstr "DEBUG: {0}"
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Zakotwiczanie platformy startowej"
@@ -195,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 "
@@ -229,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ą"
@@ -295,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"
@@ -334,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}"
@@ -390,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"
@@ -466,7 +466,7 @@ msgstr ""
"jednej linii."
msgid "Ignoring {0} nodes with null coordinates"
-msgstr ""
+msgstr "Zignorowane punkty {0} bez współrzędnych"
msgid "Download from OSM..."
msgstr "Pobierz z OSM..."
@@ -584,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)"
@@ -703,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"
@@ -867,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"
@@ -1074,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 "
@@ -1103,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>"
@@ -1142,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"
@@ -1285,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ę"
@@ -1438,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"
@@ -1554,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"
@@ -1620,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 "
@@ -1628,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"
@@ -1651,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ź"
@@ -1676,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"
@@ -1781,7 +1793,7 @@ msgid "Slower Forward"
msgstr "Zmniejsza prędkość odtwarzania."
msgid "Download GPS"
-msgstr ""
+msgstr "Pobiera GPS"
msgid "Downloading GPS data"
msgstr "Pobieranie danych GPS"
@@ -1793,16 +1805,16 @@ msgid "Markers from {0}"
msgstr "Znaczniki z {0}"
msgid "Download Compressed OSM Change"
-msgstr ""
+msgstr "Pobiera skompresowane zmiany OSM"
msgid "Download OSM Change"
-msgstr ""
+msgstr "Pobiera zmiany OSM"
msgid "Download Compressed OSM"
-msgstr ""
+msgstr "Pobiera skompresowany OSM"
msgid "Download OSM"
-msgstr ""
+msgstr "Pobiera OSM"
msgid "Downloading data"
msgstr "Pobieranie danych"
@@ -1825,7 +1837,31 @@ msgid "Request details: {0}"
msgstr "Szczegóły żądania: {0}"
msgid "Download OSM URL"
-msgstr ""
+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 "There was {0} conflict during import."
msgid_plural "There were {0} conflicts during import."
@@ -1861,7 +1897,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"
@@ -1883,9 +1919,13 @@ msgstr[0] ""
"serwera.<br>Jeśli spróbujesz później go usunąć lub zaktualizować to serwer "
"zgłosi konflikt."
msgstr[1] ""
-"Istnieje {0} obiektów w twoim lokalnym zestawie zmian, które został usunięte "
+"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."
@@ -2091,8 +2131,8 @@ msgstr ""
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"
@@ -2110,12 +2150,14 @@ msgid "Make parallel copies of ways"
msgstr "Tworzenie równoległych kopii drogi"
msgid "make parallel helper line"
-msgstr ""
+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"
@@ -2124,6 +2166,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"
@@ -2558,14 +2602,17 @@ 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"
@@ -2693,11 +2740,11 @@ 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"
@@ -2730,13 +2777,13 @@ msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
msgid "Range of primitive ids expected"
-msgstr ""
+msgstr "Oczekiwany zakres identyfikatorów elementów"
msgid "Range of changeset ids expected"
-msgstr ""
+msgstr "Oczekiwany zakres identyfikatorów zestawów zmian"
msgid "Range of versions expected"
-msgstr ""
+msgstr "Oczekiwany zakres wersji"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2768,11 +2815,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 "
@@ -2797,7 +2841,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 "
@@ -2867,6 +2911,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}"
@@ -2903,11 +2950,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"
@@ -2932,11 +2979,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}\""
@@ -3020,7 +3067,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ę?"
@@ -3052,6 +3109,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ł"
@@ -3115,11 +3175,11 @@ msgid "Reverse directional way."
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"
@@ -3148,11 +3208,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"
@@ -3173,6 +3233,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}"
@@ -3203,21 +3266,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 "
@@ -3227,11 +3288,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 "
@@ -3240,18 +3299,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 "
@@ -3268,11 +3324,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}"
@@ -3301,13 +3355,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."
@@ -3460,7 +3513,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}"
@@ -3472,11 +3525,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."
@@ -3587,7 +3637,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3628,10 +3678,6 @@ 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"
@@ -3672,6 +3718,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"
@@ -3696,11 +3745,20 @@ 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"
@@ -3743,7 +3801,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}"
@@ -3757,6 +3815,9 @@ 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"
@@ -3838,11 +3899,20 @@ msgid "Highways"
msgstr "Drogi"
msgid "Performs semantic checks on highways."
-msgstr ""
+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"
@@ -3913,6 +3983,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."
@@ -3973,15 +4049,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})"
@@ -4013,11 +4089,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}"
@@ -4136,10 +4212,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."
@@ -4153,8 +4229,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"
@@ -4228,6 +4304,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}"
@@ -4258,9 +4337,6 @@ msgstr "budynek"
msgid "area"
msgstr "obszar"
-msgid "Unclosed way"
-msgstr "Niezamknięta droga"
-
msgid "Unconnected ways"
msgstr "Niepołączone drogi"
@@ -4287,12 +4363,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''"
@@ -4355,26 +4431,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)"
@@ -4480,8 +4536,8 @@ msgstr "Pokazuje informację pomocy"
msgid "Downloading \"Message of the day\""
msgstr "Pobieranie wiadomości dnia"
-msgid "Warning: failed to read MOTD. Exception was: {0}"
-msgstr "Uwaga: błąd pobierania wiadomości dnia. Wyjątkiem był: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
+msgstr ""
msgid "Message of the day not available"
msgstr "Wiadomość dnia jest niedostępna"
@@ -4578,7 +4634,7 @@ 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"
@@ -4590,7 +4646,7 @@ msgid "Changes preferences according to the XML file"
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"
@@ -4688,7 +4744,7 @@ msgid "More tools"
msgstr "Więcej narzędzi"
msgid "Data"
-msgstr ""
+msgstr "Dane"
msgid "Selection"
msgstr "Zaznaczenie"
@@ -4717,6 +4773,18 @@ 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"
@@ -4823,20 +4891,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)"
@@ -5035,13 +5089,15 @@ 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] "{0} konflikt z tagiem oczekuje na rozwiązanie"
-msgstr[1] "{0} konfliktów z tagami 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 "Węzły(rozwiązane)"
@@ -5142,29 +5198,47 @@ 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 ""
"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"
@@ -5179,8 +5253,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ół"
@@ -5238,14 +5312,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ł"
@@ -5498,18 +5564,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 "
@@ -5856,7 +5919,8 @@ msgstr "Tagi: "
msgid "{0} Member: "
msgid_plural "{0} Members: "
msgstr[0] "{0} Członek: "
-msgstr[1] "{0} Członkiowie: "
+msgstr[1] "{0} Członkowie: "
+msgstr[2] "{0} Członków: "
msgid " as \"{0}\""
msgstr " jako \"{0}\""
@@ -6047,6 +6111,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"
@@ -6060,6 +6127,7 @@ msgid "Reloading {0} map style."
msgid_plural "Reloading {0} map styles."
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"
@@ -6130,6 +6198,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"
@@ -6222,8 +6320,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 ""
@@ -6398,9 +6495,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"
@@ -6569,6 +6663,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 "
@@ -6645,6 +6741,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"
@@ -6653,6 +6751,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"
@@ -6661,11 +6761,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"
@@ -6710,8 +6816,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"
@@ -6776,35 +6882,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ę"
@@ -6818,14 +6936,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)"
@@ -6834,7 +6952,7 @@ 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 "Wklej wartość wybranego tagu ze schowka"
@@ -6989,9 +7107,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"
@@ -7001,8 +7118,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"
@@ -7333,6 +7451,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"
@@ -7435,6 +7573,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 "
@@ -7476,21 +7617,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, "
@@ -7502,29 +7630,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"
@@ -7624,7 +7733,7 @@ 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."
@@ -7729,6 +7838,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"
@@ -7836,9 +7948,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"
@@ -7859,6 +7970,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:"
@@ -7927,8 +8044,7 @@ 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"
@@ -8012,8 +8128,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 ""
"Uwaga: Błąd pobierania pliku \"{0}\". Link \"{1}\" jest nieprawidłowy. "
"Pobieranie pominięte."
@@ -8033,11 +8149,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"
@@ -8105,7 +8218,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"
@@ -8267,12 +8387,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 "
@@ -8287,6 +8401,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"
@@ -8302,6 +8432,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"
@@ -8309,11 +8454,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..."
@@ -8453,9 +8598,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..."
@@ -8468,6 +8610,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>"
@@ -8488,10 +8633,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:"
@@ -8653,8 +8796,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"
@@ -8686,12 +8829,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] "{0} usunięto"
+msgstr[0] "{0} usunięty"
+msgstr[1] "{0} usunięte"
+msgstr[2] "{0} usuniętych"
msgid "{0} consists of:"
msgstr "Obiekty na warstwie {0}:"
@@ -8749,6 +8894,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"
@@ -8763,7 +8911,7 @@ msgid "Auto Zoom"
msgstr "Automatyczne powiększenie"
msgid "Auto load tiles"
-msgstr "Automatyczne ładowanie kafelek"
+msgstr "Automatyczne ładowanie kafelków"
msgid "Show Errors"
msgstr "Pokaż Błędy"
@@ -8787,7 +8935,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"
@@ -8796,7 +8944,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"
@@ -8805,7 +8953,7 @@ 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 ""
+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"
@@ -8914,7 +9062,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"
@@ -9004,8 +9152,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 "
@@ -9044,6 +9193,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"
@@ -9056,9 +9207,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ęć..."
@@ -9077,6 +9225,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"
@@ -9138,6 +9289,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"
@@ -9220,9 +9377,6 @@ 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"
@@ -9418,17 +9572,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 "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}''..."
@@ -9442,7 +9590,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"
@@ -9452,8 +9600,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:"
@@ -9706,8 +9853,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}''"
@@ -9922,7 +10069,7 @@ msgid ""
msgstr ""
msgid "Retrieving user info..."
-msgstr ""
+msgstr "Pobieranie informacji użytkownika..."
msgid "Audio Settings"
msgstr "Ustawienia audio"
@@ -10391,7 +10538,7 @@ msgid "shortcut"
msgstr ""
msgid "color"
-msgstr ""
+msgstr "kolor"
msgid "toolbar"
msgstr ""
@@ -10462,7 +10609,7 @@ msgstr "Dodaj ustawienie"
msgid "Advanced Background: Changed"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid "Advanced Background: NonDefault"
msgstr ""
msgid "Current value is default."
@@ -10530,6 +10677,9 @@ 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 "Podświetl docelowe drogi i węzły"
@@ -10540,7 +10690,7 @@ msgid "Smooth map graphics (antialiasing)"
msgstr "Wygładzaj rysowaną mapę (antyaliasing)"
msgid "Smooth map graphics in wireframe mode (antialiasing)"
-msgstr "Wygłądzaj rysowaną mapę w widoku szkieletowym (antyaliasing)"
+msgstr "Wygładzaj rysowaną mapę w widoku szkieletowym (antyaliasing)"
msgid "Draw only outlines of areas"
msgstr "Rysuj tylko kontury obszarów"
@@ -10586,9 +10736,14 @@ msgid ""
"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 ""
@@ -10844,25 +10999,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)"
@@ -10892,10 +11054,10 @@ msgid "3. Select image format"
msgstr ""
msgid "4. Verify generated WMS URL"
-msgstr ""
+msgstr "4. Sprawdź wygenerowany adres URL dla WMS"
msgid "5. Enter name for this layer"
-msgstr ""
+msgstr "5. Wprowadź nazwę dla tej warstwy"
msgid "Show Bounds"
msgstr "Pokaż obszar"
@@ -11000,7 +11162,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: "
@@ -11012,7 +11174,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"
@@ -11072,6 +11234,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"
@@ -11140,8 +11308,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"
@@ -11247,8 +11415,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})"
@@ -11284,10 +11453,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"
@@ -11305,7 +11474,7 @@ msgid "Supported values:"
msgstr "Obsługiwane wartości:"
msgid "Projection parameters"
-msgstr ""
+msgstr "Parametry projekcji"
msgid "False easting and false northing"
msgstr ""
@@ -11419,21 +11588,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"
@@ -11455,16 +11609,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 "
@@ -11507,8 +11678,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:"
@@ -11517,20 +11688,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 ""
@@ -11573,9 +11749,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."
@@ -11616,15 +11793,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 ""
@@ -11668,7 +11842,7 @@ msgid "Add a new tag"
msgstr "Dodaje nowy tag"
msgid "Paste tags from buffer"
-msgstr ""
+msgstr "Wklej tagi ze schowka"
msgid "Use preset ''{0}'' of group ''{1}''"
msgstr "Używa szablon \"{0}\" z grupy \"{1}\""
@@ -11697,8 +11871,8 @@ msgstr "Zastosuj szablon"
msgid "New relation"
msgstr "Nowa relacja"
-msgid "Change Properties"
-msgstr "Zmień właściwości"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -11776,9 +11950,6 @@ msgstr ""
msgid "Preset sub element without parent"
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}: "
@@ -11797,6 +11968,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 (*.*)"
@@ -11827,6 +12006,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 "Cut"
msgstr ""
@@ -11863,7 +12090,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 ""
@@ -11903,29 +12130,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..."
@@ -12023,6 +12251,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}"
@@ -12038,12 +12269,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}."
@@ -12125,8 +12365,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!"
@@ -12227,48 +12467,24 @@ 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}''."
+"Unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+"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 ""
-"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 "
-"({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 ..."
@@ -12295,12 +12511,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>"
@@ -12333,7 +12546,7 @@ msgid "Open OSM file"
msgstr "Otwórz plik OSM"
msgid "Reading was canceled"
-msgstr ""
+msgstr "Anulowano wczytywanie"
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
@@ -12385,12 +12598,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}."
@@ -12591,7 +12804,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 "RemoteControl::Accepting connections on port {0}"
@@ -12637,6 +12856,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."
@@ -12662,24 +12890,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 ""
@@ -12701,11 +12929,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}''."
@@ -12775,13 +13015,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}''"
@@ -12909,8 +13149,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 ""
@@ -12937,12 +13178,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"
@@ -12957,22 +13198,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}''"
@@ -13017,7 +13257,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 ""
@@ -13049,8 +13289,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..."
@@ -13065,9 +13304,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}''"
@@ -13298,6 +13552,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 ""
@@ -13327,7 +13583,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 "
@@ -13363,6 +13619,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>"
@@ -13411,12 +13670,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -13427,9 +13685,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 ""
@@ -13439,13 +13742,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?"
@@ -13454,16 +13757,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."
@@ -13529,6 +13847,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"
@@ -13786,6 +14106,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 ""
@@ -13942,7 +14267,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."
@@ -13954,6 +14279,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 "
@@ -13988,6 +14316,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 "
@@ -14037,6 +14367,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."
@@ -14088,9 +14421,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr "Twórz i edytuj mapy dla OpenSeaMap"
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -14127,6 +14457,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 ""
@@ -14240,6 +14575,9 @@ msgstr "Tunel"
msgid "Embankment"
msgstr "Nasyp"
+msgid "Toll"
+msgstr "bramka (opłata)"
+
msgid "Motorway Link"
msgstr "Autostrada - dojazd"
@@ -14277,7 +14615,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"
@@ -14289,25 +14627,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"
@@ -14324,6 +14662,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"
@@ -14342,11 +14724,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"
@@ -14357,6 +14739,9 @@ msgstr "podjazd"
msgid "parking_aisle"
msgstr "uliczka parkingowa"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Uliczka parkingowa"
@@ -14384,18 +14769,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"
@@ -14405,9 +14784,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"
@@ -14417,15 +14793,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"
@@ -14471,6 +14847,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)"
@@ -14529,10 +14908,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"
@@ -14555,6 +14934,9 @@ msgstr "Edycja mostu"
msgid "viaduct"
msgstr "Wiadukt"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -14659,20 +15041,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"
@@ -14689,11 +15080,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"
@@ -14728,8 +15119,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"
@@ -14797,12 +15188,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"
@@ -14818,15 +15215,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)"
@@ -14848,6 +15236,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"
@@ -14857,6 +15254,9 @@ msgstr "Ustąpienie pierwszeństwa"
msgid "Mini-roundabout"
msgstr "Minirondo"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Kierunek"
@@ -14866,10 +15266,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"
@@ -14902,9 +15299,6 @@ msgstr "podest"
msgid "Passing Place"
msgstr "Zatoka"
-msgid "Edit Passing Place"
-msgstr "Edycja zatoki"
-
msgid "Turning Circle"
msgstr "Miejsce do zawracania"
@@ -14947,6 +15341,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr "Dozwolony ruch:"
+msgid "Material"
+msgstr "Materiał"
+
+msgid "stone"
+msgstr "kamień"
+
msgid "Bollard"
msgstr "Słupek drogowy"
@@ -14962,6 +15362,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr "plastik"
+
msgid "Cycle Barrier"
msgstr "Przegroda dla rowerzystów"
@@ -15031,20 +15434,17 @@ msgstr ""
msgid "electric"
msgstr "energia elektryczna"
-msgid "roundpole"
-msgstr ""
+msgid "pole"
+msgstr "słup"
-msgid "split_rail"
+msgid "Guard Rail"
msgstr ""
-msgid "chain"
-msgstr "łańcuch"
-
-msgid "hedge"
-msgstr "żywopłot"
+msgid "Edit Guard Rail"
+msgstr ""
-msgid "pole"
-msgstr "słup"
+msgid "wire"
+msgstr ""
msgid "Guard Rail"
msgstr ""
@@ -15083,11 +15483,21 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-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"
@@ -15140,12 +15550,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr "Materiał"
-
-msgid "stone"
-msgstr "kamień"
-
msgid "Turnstile"
msgstr "Kołowrotek"
@@ -15206,12 +15610,21 @@ msgstr "Edycja odpływu"
msgid "Ditch"
msgstr "Rów"
-msgid "Stream"
-msgstr "Strumień"
+msgid "Edit Ditch"
+msgstr "Edytuj rów"
+
+msgid "Stream"
+msgstr "Strumień"
msgid "Edit Stream"
msgstr "Edycja strumienia"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Kanał"
@@ -15251,9 +15664,6 @@ msgstr "Edycja tamy"
msgid "Groyne"
msgstr "Ostroga regulacyjna"
-msgid "Edit Groyne"
-msgstr "Edycja ostrogi regulacyjnej"
-
msgid "Breakwater"
msgstr "Falochron"
@@ -15287,6 +15697,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)"
@@ -15368,20 +15793,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"
@@ -15455,8 +15885,8 @@ msgstr "turystyka"
msgid "freight"
msgstr ""
-msgid "Service/Type"
-msgstr "Typ"
+msgid "Service type"
+msgstr ""
msgid "yard"
msgstr "dworzec przetokowy"
@@ -15479,11 +15909,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"
@@ -15494,9 +15927,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"
@@ -15548,6 +15978,9 @@ msgstr ""
msgid "Level Crossing"
msgstr "Przejazd kolejowy"
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr "Strzeżony"
@@ -15560,18 +15993,32 @@ msgstr ""
msgid "Barrier"
msgstr ""
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
msgid "half"
-msgstr "połowiczna"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "pełna"
+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"
@@ -15671,11 +16118,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -15687,13 +16132,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"
@@ -15710,12 +16153,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ź"
@@ -15743,9 +16186,6 @@ msgstr "Miejsce parkingowe"
msgid "Edit Parking space"
msgstr "Edycja miejsca parkinkowego"
-msgid "rooftop"
-msgstr "na dachu"
-
msgid "Capacity"
msgstr "Pojemność"
@@ -15767,11 +16207,30 @@ 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 "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Wt-N 08:00-15:00;So 08:00-12:00"
+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 "Wjazd na parking"
@@ -15920,6 +16379,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"
@@ -15941,6 +16403,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"
@@ -15968,6 +16436,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"
@@ -15992,22 +16466,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"
@@ -16029,9 +16487,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Części"
-
msgid "Clothes"
msgstr "Odzież"
@@ -16226,6 +16681,9 @@ msgstr "Miejsce oczekiwania"
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr "Autobus"
@@ -16256,6 +16714,9 @@ msgstr ""
msgid "Ferry"
msgstr "Prom"
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Ławka"
@@ -16268,9 +16729,6 @@ msgstr "Dla niepełnosprawnych"
msgid "limited"
msgstr "limitowane"
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -16280,8 +16738,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"
@@ -16295,6 +16758,9 @@ msgstr "Edycja wejścia do metra"
msgid "Ticket Machine"
msgstr "Automat biletowy"
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr "Numer identyfikacyjny"
@@ -16319,14 +16785,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"
@@ -16375,8 +16833,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"
@@ -16429,6 +16887,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"
@@ -16451,21 +16924,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"
@@ -16655,9 +17113,6 @@ msgstr "Klub ze stripteasem"
msgid "Edit Stripclub"
msgstr "Edycja klubu ze stripteasem"
-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 "Tourism"
msgstr "Turystyka"
@@ -16679,9 +17134,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ść"
@@ -16694,6 +17155,9 @@ msgstr "ulice"
msgid "scheme"
msgstr "schemat"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Obszar"
@@ -16733,6 +17197,9 @@ msgstr "...możliwe inne rodzaje transportu"
msgid "Information Board"
msgstr "Tablica informacyjna"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Zawartość"
@@ -16754,23 +17221,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"
@@ -16899,50 +17378,44 @@ msgstr "Sztuka"
msgid "Edit Artwork"
msgstr "Edycja obiektu sztuki"
-msgid "Place of Worship"
-msgstr "Miejsce kultu religijnego"
-
-msgid "Edit Place of Worship"
-msgstr "Edycja miejsca kultu religijnego"
-
-msgid "Religion"
-msgstr "Religia"
+msgid "Recording Studio"
+msgstr "Studio nagrań"
-msgid "bahai"
-msgstr "bahaizm"
+msgid "Edit Studio"
+msgstr "Edycja studia nagrań"
-msgid "buddhist"
-msgstr "buddyzm"
+msgid "audio"
+msgstr "audio"
-msgid "christian"
-msgstr "chrześcijaństwo"
+msgid "video"
+msgstr "video"
-msgid "hindu"
-msgstr "hinduizm"
+msgid "Place of Worship"
+msgstr "Miejsce kultu religijnego"
-msgid "jain"
-msgstr "dżinizm"
+msgid "Church"
+msgstr "Kościół"
-msgid "jewish"
-msgstr "judaizm"
+msgid "Edit Church"
+msgstr ""
-msgid "muslim"
-msgstr "islam"
+msgid "Building type"
+msgstr ""
-msgid "sikh"
-msgstr "sikhizm"
+msgid "basilica"
+msgstr ""
-msgid "spiritualist"
-msgstr "spirytualizm"
+msgid "cathedral"
+msgstr ""
-msgid "taoist"
-msgstr "taoizm"
+msgid "chapel"
+msgstr ""
-msgid "unitarian"
-msgstr "unitarianizm"
+msgid "church"
+msgstr "kościół"
-msgid "zoroastrian"
-msgstr "zaratusztrianizm"
+msgid "temple"
+msgstr ""
msgid "Denomination"
msgstr "Wyznanie"
@@ -16959,6 +17432,12 @@ msgstr "katolickie"
msgid "evangelical"
msgstr "ewangelikalizm"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "świadkowie Jehowy"
@@ -16971,6 +17450,9 @@ msgstr "metodyści"
msgid "mormon"
msgstr "mormoni"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "kościół prawosławny"
@@ -16989,43 +17471,143 @@ msgstr "kwakrzy"
msgid "roman_catholic"
msgstr "rzymskokatolickie"
-msgid "shia"
-msgstr "szyici"
+msgid "russian_orthodox"
+msgstr ""
-msgid "sunni"
-msgstr "sunnici"
+msgid "seventh_day_adventist"
+msgstr ""
msgid "Service Times"
msgstr "Godziny nabożeństw"
-msgid "Su 10:00"
-msgstr "Nd 10:00"
+msgid "18:00"
+msgstr ""
-msgid "Su 10:30"
-msgstr "Nd 10:30"
+msgid "sunset,sunrise"
+msgstr ""
-msgid "Su 11:00"
-msgstr "Nd 11:00"
+msgid "Su 9:30,11:00"
+msgstr ""
-msgid "Opening Hours for visiting"
-msgstr "Godziny otwarcia"
+msgid "Sa,Su,PH 9:00"
+msgstr ""
-msgid "Recording Studio"
-msgstr "Studio nagrań"
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
-msgid "Edit Studio"
-msgstr "Edycja studia nagrań"
+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 "Meczet"
-msgid "Public Building"
-msgstr "Budynek użyteczności publicznej"
+msgid "Edit Mosque"
+msgstr "Edycja Meczetu"
-msgid "Edit Public Building"
+msgid "mosque"
+msgstr "meczet"
+
+msgid "ibadi"
+msgstr ""
+
+msgid "shia"
+msgstr "szyici"
+
+msgid "sunni"
+msgstr "sunnici"
+
+msgid "Synagogue"
+msgstr "Synagoga"
+
+msgid "Edit Synagogue"
+msgstr "Edycja Synagogi"
+
+msgid "synagogue"
+msgstr "synagoga"
+
+msgid "conservative"
+msgstr "ortodoksyjna"
+
+msgid "reform"
+msgstr "reformowana"
+
+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 "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"
+
+msgid "Edit Public Building"
msgstr "Edycja budynku użyteczności publicznej"
msgid "Town hall"
@@ -17109,6 +17691,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"
@@ -17190,12 +17778,66 @@ msgstr "Weterynarz"
msgid "Edit Veterinary"
msgstr "Edycja lecznicy weterynaryjnej"
-msgid "Drinking water"
+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"
@@ -17205,6 +17847,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"
@@ -17214,31 +17880,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ść)"
@@ -17264,25 +17936,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"
@@ -17293,21 +17965,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 "plastic"
-msgstr "plastik"
-
msgid "Amount of Seats"
msgstr "Pojemność"
@@ -17319,15 +17985,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"
@@ -17342,8 +18008,17 @@ msgstr "Edycja ambony strzelniczej"
msgid "Height"
msgstr "Wysokość"
+msgctxt "height"
msgid "low"
-msgstr "niska"
+msgstr ""
+
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
msgid "Hide"
msgstr "Ukryj"
@@ -17351,11 +18026,8 @@ msgstr "Ukryj"
msgid "Lock"
msgstr "Zablokuj"
-msgid "Drinking Water"
-msgstr "Woda do picia"
-
msgid "Edit Source of Potable Water"
-msgstr ""
+msgstr "Edycja wody do picia"
msgid "Indoor"
msgstr ""
@@ -17380,11 +18052,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"
@@ -17405,7 +18080,7 @@ msgid "Pressure (in bar)"
msgstr "Ciśnienie (w barach)"
msgid "suction"
-msgstr ""
+msgstr "ssanie"
msgid "Count"
msgstr "Liczba"
@@ -17422,119 +18097,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"
@@ -17566,33 +18277,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"
@@ -17626,6 +18347,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"
@@ -17682,7 +18419,7 @@ msgid "Skating"
msgstr "Łyżwiarstwo"
msgid "Edit Skating"
-msgstr "Edycja łyżwiarstwa"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -17726,36 +18463,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 ""
@@ -17798,19 +18553,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 ""
@@ -17949,6 +18700,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"
@@ -17961,59 +18724,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"
@@ -18064,7 +18901,7 @@ msgid "Edit Pipeline"
msgstr "Edycja rurociągu"
msgid "water"
-msgstr "woda"
+msgstr "wodny"
msgid "gas"
msgstr "gazowy"
@@ -18083,11 +18920,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"
@@ -18239,41 +19076,67 @@ 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 Monitoring Station"
+msgstr "Edycja stacji pomiarowej"
-msgid "Edit Measurement Station"
-msgstr "Edycja stacji pomiaru"
+msgid "Monitoring:"
+msgstr "Monitoring"
-msgid "Measurement"
-msgstr "Pomiar"
+msgid "Weather"
+msgstr "Pogoda"
-msgid "particulate_matter"
-msgstr "pyłu"
+msgid "Water level"
+msgstr "Poziom wody"
-msgid "seismic"
-msgstr "sejsmiczny"
+msgid "Tide Level"
+msgstr "Pływy"
-msgid "water_level"
-msgstr "poziom wody"
+msgid "Traffic"
+msgstr "Ruch uliczny"
-msgid "weather"
-msgstr "pogoda"
+msgid "Air Quality"
+msgstr "Jakość powietrza"
-msgid "Recording"
-msgstr "Zapisywanie"
+msgid "Noise"
+msgstr "Głośność"
-msgid "manually"
-msgstr "ręcznie"
+msgid "GPS Signals"
+msgstr "Sygnały GPS"
-msgid "automated"
-msgstr "automatycznie"
+msgid "GLONASS Signals"
+msgstr "Sygnały GLONASS"
-msgid "remote"
-msgstr "zdalnie"
+msgid "Galileo Signals"
+msgstr "Sygnały Galileo"
-msgctxt "display"
-msgid "no"
+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"
@@ -18282,29 +19145,119 @@ msgstr "Punkt geodezyjny"
msgid "Edit Survey Point"
msgstr "Edycja punktu geodezyjnego"
-msgid "Surveillance"
-msgstr "Monitoring"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Edycja kamery do monitoringu"
-msgid "indoor"
-msgstr "wewnętrzny"
+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 "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 "hot water"
+msgstr "gorąca woda"
+
+msgid "hot air"
+msgstr "gorące powietrze"
+
+msgid "cold water"
+msgstr "zimna woda"
-msgid "outdoor"
-msgstr "zewnętrzny"
+msgid "cold air"
+msgstr "zimne powietrze"
-msgid "public"
-msgstr "publiczny"
+msgid "compressed air"
+msgstr "sprężone powietrze"
-msgid "Power"
-msgstr "Energetyka"
+msgid "steam"
+msgstr "para wodna"
+
+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"
@@ -18340,7 +19293,7 @@ msgid "tidal"
msgstr ""
msgid "waste"
-msgstr ""
+msgstr "spalarnia"
msgid "wave"
msgstr ""
@@ -18351,89 +19304,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 "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 "ładowanie akumulatora"
+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"
@@ -18444,6 +19500,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"
@@ -18459,6 +19530,9 @@ msgstr "Edycja słupa wysokiego napięcia"
msgid "Tower reference"
msgstr "Numer referencyjny"
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr "Słup"
@@ -18477,13 +19551,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"
@@ -18590,14 +19662,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"
@@ -18605,7 +19677,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)"
@@ -18626,6 +19698,9 @@ msgstr "Plac targowy"
msgid "Edit Marketplace"
msgstr "Edycja placu targowego"
+msgid "Organic"
+msgstr "Naturalna żywność"
+
msgid "Greengrocer"
msgstr "Sklep warzywny"
@@ -18633,25 +19708,22 @@ msgid "Edit Greengrocer"
msgstr "Edycja sklepu warzywnego"
msgid "Farm Stand"
-msgstr ""
+msgstr "Stoisko gospodarstwa rolnego"
msgid "Edit Farm Stand"
-msgstr ""
-
-msgid "Organic"
-msgstr "Naturalna żywność"
+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"
@@ -18710,8 +19782,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"
@@ -18731,14 +19803,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"
@@ -18746,9 +19818,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"
@@ -18774,6 +19845,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"
@@ -18810,11 +19887,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"
@@ -18843,8 +19941,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"
@@ -18855,20 +19953,20 @@ 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 papierniczy"
@@ -18903,8 +20001,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"
@@ -19116,6 +20214,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"
@@ -19155,24 +20259,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"
@@ -19182,15 +20295,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 ""
@@ -19266,6 +20370,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"
@@ -19320,8 +20430,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"
@@ -19332,6 +20442,9 @@ msgstr "Cmentarz przykościelny"
msgid "Edit Graveyard"
msgstr "Edycja cmentarza przykościelnego"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Cmentarz"
@@ -19407,6 +20520,33 @@ msgstr "Edycja komieniołomu"
msgid "Annotation"
msgstr "Adnotacja"
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr "Alternatywna nazwa"
+
+msgid "Historical name"
+msgstr "Nazwa historyczna"
+
+msgid "Local name"
+msgstr "Lokalna nazwa"
+
+msgid "Regional name"
+msgstr "Nazwa regionalna"
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr "Międzynarodowa nazwa"
+
+msgid "Official name"
+msgstr "Oficjalna nazwa"
+
+msgid "Common name abbreviation"
+msgstr "Najpopularniejsze odmiany nazwy"
+
msgid "Edit Address Information"
msgstr "Edycja informacji o adresach"
@@ -19443,6 +20583,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)"
@@ -19611,20 +20763,49 @@ msgstr ""
msgid "Edit general route"
msgstr ""
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+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"
-msgid "hiking"
+msgctxt "route type"
+msgid "hiking"
+msgstr ""
+
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
+msgid "detour"
+msgstr ""
+
+msgctxt "route type"
+msgid "railway"
msgstr ""
-msgid "detour"
-msgstr "objazd"
+msgctxt "route type"
+msgid "subway"
+msgstr ""
msgid "Symbol description"
msgstr "Opis symboli"
@@ -19671,20 +20852,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"
@@ -19707,8 +20891,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)"
@@ -19803,18 +20987,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"
@@ -19824,8 +21017,11 @@ msgstr "bariera"
msgid "motorroad"
msgstr ""
-msgid "highway_track"
-msgstr "droga gruntowa"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "serwis"
@@ -19833,10 +21029,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"
@@ -19854,6 +21050,9 @@ msgstr "bystrze"
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19869,28 +21068,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"
@@ -19911,20 +21110,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"
@@ -19960,7 +21159,7 @@ msgid "brownfield"
msgstr "teren poprzemysłowy"
msgid "greenfield"
-msgstr "Teren nie zabudowany"
+msgstr "Teren niezabudowany"
msgid "railland"
msgstr "Teren kolejowy"
@@ -19998,10 +21197,13 @@ msgstr "droga"
msgid "boundary"
msgstr "granica"
+msgid "sport"
+msgstr "Sport"
+
msgid "place"
msgstr "Miejsce"
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -20016,9 +21218,6 @@ msgstr "Miasto"
msgid "One Way"
msgstr "Jednokierunkowa"
-msgid "Church"
-msgstr "Kościół"
-
msgid "Fuel Station"
msgstr "Stacja benzynwa"
@@ -20041,11 +21240,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 ""
@@ -20071,7 +21273,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 ""
@@ -20083,7 +21285,7 @@ msgid "relation without type"
msgstr ""
msgid "restaurant without name"
-msgstr ""
+msgstr "restauracja bez wpisanej nazwy"
msgid "unusual tag combination (highway & waterway)"
msgstr ""
@@ -20091,10 +21293,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"
@@ -20106,7 +21338,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"
@@ -20124,7 +21356,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -20241,19 +21473,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 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"
@@ -20271,8 +21614,48 @@ 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 "unknown language prefix in wikipedia tag"
+msgstr ""
+
+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 "unkown language prefix in wikipedia tag"
+msgid "unusual incline; use percentages/degrees or up/down"
msgstr ""
msgid "Landsat"
@@ -20284,19 +21667,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 "skobbler heatmap"
@@ -20317,7 +21709,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -20326,6 +21718,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -20472,6 +21867,29 @@ 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 ""
@@ -20637,6 +22055,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -20673,15 +22094,48 @@ msgstr ""
msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "7th Series (OS7)"
msgstr ""
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 "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 ""
@@ -20883,6 +22337,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"
@@ -20904,13 +22370,7 @@ msgstr ""
msgid "Time"
msgstr "Czas"
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -21177,10 +22637,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 "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -21388,7 +22851,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"
@@ -21659,15 +23122,6 @@ msgstr "Numer budynku:"
msgid "Street Name:"
msgstr "Nazwa ulicy:"
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -21838,6 +23292,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 ""
@@ -21848,19 +23305,13 @@ 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 ""
@@ -21940,10 +23391,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 ""
@@ -21997,6 +23448,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 ""
@@ -22014,6 +23468,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?"
@@ -22096,57 +23553,64 @@ msgstr ""
"Ten obraz zawiera georeferencjonowane dane.\n"
"Czy chcesz ich użyć ?"
-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"
-msgstr "{0} nie jest dozwolone przy bieżacym odwzorowaniu"
+msgid "Add new layer"
+msgstr "Dodaj nową warstwę"
-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)"
-msgstr "(opcjonalnie)"
+msgid "Reset cookie"
+msgstr "Resetuj ciasteczka"
-msgid "Change location"
-msgstr "Zmień lokalizację"
+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 "pliki PNG (*.png)"
+
+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 nową warstwę"
+msgid "Image georeferencing"
+msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
+"Czy chcesz anulować całkowicie\n"
+"czy powtórzyć? "
msgid "Refine georeferencing"
msgstr ""
@@ -22163,8 +23627,14 @@ msgstr ""
msgid "Save image as..."
msgstr ""
-msgid "PNG files (*.png)"
-msgstr "pliki PNG (*.png)"
+msgid "East"
+msgstr "Wschód"
+
+msgid "I use the mouse"
+msgstr "Używam myszki"
+
+msgid "Set {0} Lambert coordinates"
+msgstr ""
msgid "GeoTiff files (*.tif)"
msgstr ""
@@ -22244,8 +23714,11 @@ 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."
@@ -22294,7 +23767,7 @@ msgstr "Usuń zaznaczony schemat z listy."
msgid "Color Schemes"
msgstr "Schematy kolorów"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -22442,15 +23915,16 @@ msgid "Zoom in to see messages"
msgstr ""
msgid "Login"
-msgstr ""
+msgstr "Zaloguj"
msgid "Enable autologin"
msgstr ""
msgid "{0} user"
msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} użytkownik"
+msgstr[1] "{0} użytkownicy"
+msgstr[2] "{0} użytkowników"
msgid "not logged in"
msgstr ""
@@ -22471,13 +23945,13 @@ msgid "Close tab"
msgstr ""
msgid "Logout"
-msgstr ""
+msgstr "Wyloguj"
msgid "Clear log"
msgstr ""
msgid "Show users on map"
-msgstr ""
+msgstr "Pokaż użytkowników na mapie"
msgid "Position only"
msgstr "Tylko pozycja"
@@ -22518,27 +23992,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 "usuń dane po imporcie"
-
msgid "Importing data from device."
msgstr ""
@@ -22960,7 +24416,7 @@ msgid "A calibration geometry of {0} nodes by {1}"
msgstr ""
msgid "Change Color"
-msgstr ""
+msgstr "Zmień kolor"
msgid "Deprecate Offset"
msgstr ""
@@ -23622,9 +25078,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 ""
@@ -23767,7 +25247,7 @@ msgid "proxy username"
msgstr ""
msgid "proxy password"
-msgstr ""
+msgstr "hasło proxy"
msgid "oauth key"
msgstr ""
@@ -23846,7 +25326,7 @@ msgid "Zip Files"
msgstr "Pliki Zip"
msgid "7Zip Files"
-msgstr ""
+msgstr "Pliki 7Zip"
msgid "OpenData XML files"
msgstr "Pliki OpenData XML"
@@ -24011,7 +25491,7 @@ msgid "File to load"
msgstr "Plik do wczytania"
msgid "Reading 7Zip file..."
-msgstr ""
+msgstr "Czytanie pliku 7Zip..."
msgid "Reading Zip file..."
msgstr "Czytanie pliku Zip..."
@@ -24035,10 +25515,10 @@ msgid ""
msgstr ""
msgid "Warning: CRS not found"
-msgstr ""
+msgstr "Ostrzeżenie: Nie znaleziono CRS"
msgid "Unable to detect CRS !"
-msgstr ""
+msgstr "Nie można wykryć CRS"
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -24144,8 +25624,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."
@@ -24280,9 +25761,6 @@ msgstr ""
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 "Process queue"
msgstr ""
@@ -24337,18 +25815,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"
@@ -24698,6 +26164,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 "Czy chcesz zapisać aktualną kalibrację warstwy {0}?"
@@ -24738,7 +26225,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"
@@ -24849,6 +26336,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"
@@ -24901,7 +26391,7 @@ msgid "Osmosis polygon filter files"
msgstr ""
msgid "Print..."
-msgstr ""
+msgstr "Drukuj..."
msgid "Print the map"
msgstr "Drukuj mapę"
@@ -24982,7 +26472,7 @@ msgid "Create Stops from GTFS ..."
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 ""
@@ -25008,7 +26498,7 @@ msgid "light_rail"
msgstr ""
msgid "Create Stops from GTFS"
-msgstr ""
+msgstr "Utwórz przystanki z GTFS"
msgid "GTFS-Stops"
msgstr ""
@@ -25020,7 +26510,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 ""
@@ -25152,25 +26642,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 ""
@@ -25384,6 +26871,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 ""
@@ -25416,15 +26906,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 "znaki"
+msgid "Change Properties"
+msgstr "Zmień właściwości"
+
msgid "Country preset:"
msgstr ""
@@ -25510,7 +27016,7 @@ msgid "Open a list of routing nodes"
msgstr ""
msgid "Add routing layer"
-msgstr ""
+msgstr "Dodaj warstwę trasy"
msgid "Criteria"
msgstr "Kryteria"
@@ -25539,9 +27045,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr "Typ drogi"
-
msgid "Speed (Km/h)"
msgstr "Prędkość (km/h)"
@@ -25561,6 +27064,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 ""
@@ -25580,7 +27086,7 @@ msgid "SDS data file"
msgstr ""
msgid "Load..."
-msgstr ""
+msgstr "Wczytaj..."
msgid "Load separate data store data from a file."
msgstr ""
@@ -25643,13 +27149,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 ""
@@ -25720,19 +27226,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"
@@ -25948,6 +27454,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"
@@ -25984,6 +27579,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..."
@@ -26136,9 +27735,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:"
@@ -26975,10 +28571,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"
@@ -27046,7 +28642,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 ""
@@ -27092,19 +28688,19 @@ msgid "Select all connected ways"
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 ""
@@ -27146,10 +28742,11 @@ 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 "Proszę wybrać jedną lub dwie drogi dla tej akcji"
@@ -27178,9 +28775,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"
@@ -27251,28 +28845,28 @@ 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 "
@@ -27311,17 +28905,17 @@ msgid "mute"
msgstr "wycisz"
msgid "Walking Papers Scanned Map"
-msgstr ""
+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 wrzucona na walking-"
-"papers.org"
+"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 "Nie mogę przeczytać informacji z walking-papers.org o id \"{0}\""
@@ -27333,7 +28927,7 @@ msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr "Walking Papers warstwa ({0}) w powiększeniu {1}"
msgid "Way Download"
-msgstr "Droga pobierania"
+msgstr "Pobierz na końcu..."
msgid "Download map data on the end of selected way"
msgstr "Pobierz dane mapy z końca wybranej drogi"
@@ -27368,10 +28962,11 @@ msgid "Merge duplicate node?"
msgstr "Połączyć zduplikowany węzeł?"
msgid "<html>No more connected ways to download.</html>"
-msgstr "<html>Brak połączonych dróg do poprania.</html>"
+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 ponad dwoma połączonymi drogami."
+msgstr ""
+"Węzeł ''{0}'' jest skrzyżowaniem z więcej niż dwiema połączonymi drogami."
msgid "Enter search expression here.."
msgstr "Wprowadź frazę do znalezienia..."
@@ -27391,7 +28986,7 @@ msgid "Way Select"
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"
@@ -27420,7 +29015,7 @@ msgid "Available via WIWOSM server"
msgstr "Dostępne przez serwer WIWOSM"
msgid "Available in local dataset"
-msgstr "Dostępne w lokalnym zestawie zmian"
+msgstr "Dostępne w lokalnym zestawie danych"
msgid "Not linked yet"
msgstr "Jeszcze nie połączone"
@@ -27432,7 +29027,7 @@ msgid "{0}.Wikipedia.org: {1}"
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 "współrzędne"
@@ -27441,7 +29036,7 @@ msgid "Category"
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 "Wprowadź kategorię Wikipedii"
@@ -27450,7 +29045,7 @@ msgid "Clipboard"
msgstr "Schowek"
msgid "Pastes Wikipedia articles from the system clipboard"
-msgstr "Wkleja artykuły zamieszone w Wikipedii z systemowego schowka"
+msgstr "Wkleja artykuły zamieszczone w Wikipedii ze schowka systemowego"
msgid "clipboard"
msgstr "schowek"
@@ -27469,13 +29064,11 @@ msgstr "Ustawia domyślny język dla artykułów Wikipedii"
msgid "Enter the Wikipedia language"
msgstr "Wprowadź język wikipedii"
-msgid "Add Tag"
-msgstr "Dodaj tag"
-
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 "The Ultimate WMS Super-speed Turbo Challenge II"
diff --git a/i18n/po/pt.po b/i18n/po/pt.po
index a1f751b..412cc50 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-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-07-12 23:02+0000\n"
-"Last-Translator: Blademir <blademirtc at hotmail.com>\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-08-05 04:56+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ 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}"
@@ -59,6 +62,9 @@ msgstr "INFO: {0}"
msgid "DEBUG: {0}"
msgstr "DEBUG: {0}"
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "A executar arranque da plataforma"
@@ -162,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 "
@@ -266,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"
@@ -305,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}"
@@ -362,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"
@@ -554,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)"
@@ -678,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"
@@ -852,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"
@@ -1060,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 "
@@ -1089,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>"
@@ -1278,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"
@@ -1433,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"
@@ -1546,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"
@@ -1791,7 +1795,7 @@ msgid "Slower Forward"
msgstr "Avançar mais lentamente"
msgid "Download GPS"
-msgstr ""
+msgstr "Descarregar dados GPS"
msgid "Downloading GPS data"
msgstr "A descarregar dados do GPS"
@@ -1856,6 +1860,9 @@ 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})"
@@ -2102,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"
@@ -2584,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"
@@ -2797,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 "
@@ -2896,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}"
@@ -2932,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"
@@ -2960,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}\""
@@ -3081,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ó"
@@ -3147,11 +3158,9 @@ 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"
@@ -3180,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"
@@ -3209,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}"
@@ -3243,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 "
@@ -3267,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 "
@@ -3280,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 "
@@ -3309,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}"
@@ -3343,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}''."
@@ -3519,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."
@@ -3637,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)"
@@ -3681,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"
@@ -3726,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"
@@ -3752,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"
@@ -3813,6 +3816,9 @@ 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"
@@ -3899,6 +3905,15 @@ 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"
@@ -3976,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"
@@ -4037,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})"
@@ -4078,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}"
@@ -4230,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"
@@ -4315,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}"
@@ -4345,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"
@@ -4376,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)"
@@ -4449,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"
@@ -4572,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"
@@ -4790,7 +4790,7 @@ msgid "More tools"
msgstr "Mais Ferramentas"
msgid "Data"
-msgstr ""
+msgstr "Dados"
msgid "Selection"
msgstr "Seleção"
@@ -4802,7 +4802,7 @@ msgid "More..."
msgstr "Mais..."
msgid "GPS"
-msgstr ""
+msgstr "GPS"
msgid "Windows"
msgstr "Painéis"
@@ -4821,6 +4821,18 @@ 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"
@@ -4927,21 +4939,6 @@ 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)"
@@ -5253,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."
@@ -5260,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."
@@ -5267,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."
@@ -5286,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"
@@ -5302,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"
@@ -5354,16 +5369,6 @@ 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 ""
-"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ó"
@@ -5637,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 "
@@ -6239,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"
@@ -6322,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"
@@ -6417,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 "
@@ -6603,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"
@@ -6951,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 ""
@@ -7027,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"
@@ -7069,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)"
@@ -7240,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"
@@ -7590,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"
@@ -7749,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, "
@@ -7775,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"
@@ -7911,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 ""
@@ -8024,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"
@@ -8137,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"
@@ -8161,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:"
@@ -8232,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. "
-"Ocorreu uma exceção de segurança."
msgid "Enter credentials for OSM API"
msgstr "Introduza as credenciais para a API OSM"
@@ -8320,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 "
@@ -8341,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"
@@ -8597,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 "
@@ -8617,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"
@@ -8633,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"
@@ -8640,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 ..."
@@ -8781,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..."
@@ -8793,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>"
@@ -8813,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:"
@@ -8966,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"
@@ -8999,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"
@@ -9382,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..."
@@ -9403,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"
@@ -9462,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"
@@ -9544,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"
@@ -9742,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}''..."
@@ -9772,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."
@@ -9785,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:"
@@ -10059,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}''"
@@ -10872,8 +10911,8 @@ msgstr "Adicionar preferência"
msgid "Advanced Background: Changed"
msgstr "Fundo Avançado: Alterado"
-msgid "Advanced Background: NonDefalut"
-msgstr "Fundo Avançado: NãoPadrão"
+msgid "Advanced Background: NonDefault"
+msgstr ""
msgid "Current value is default."
msgstr "O valor atual é o valor de origem."
@@ -10943,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"
@@ -11014,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"
@@ -11523,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"
@@ -11590,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"
@@ -11875,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"
@@ -11911,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}''"
@@ -11978,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:"
@@ -11990,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. "
@@ -12103,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"
@@ -12188,8 +12229,8 @@ msgstr "Aplicar Etiquetas"
msgid "New relation"
msgstr "Criar relação"
-msgid "Change Properties"
-msgstr "Alterar Propriedades"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr "Requisito desconhecido: {0}"
@@ -12235,6 +12276,8 @@ msgid ""
"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
"not \"{2}\""
msgstr ""
+"Aviso sobre os modelos de etiquetas \"{0}-{1}\": A ignorar o atributo "
+"''{2}'' conforme ''{3}'' elementos indicados."
msgid ""
"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
@@ -12258,11 +12301,11 @@ msgstr ""
msgid "Unknown type: {0}"
msgstr "Tipo desconhecido: {0}"
-msgid "Preset group {1} / {0}"
-msgstr "Grupo de modelos {1} / {0}"
+msgid "Could not read tagging preset source: {0}"
+msgstr "Não foi possível ler a fonte do modelo de etiquetas: {0}"
-msgid "Preset group {0}"
-msgstr "Grupo de modelos {0}"
+msgid "Error parsing {0}: "
+msgstr "Erro ao processar {0}: "
msgid "Roles cannot appear more than once"
msgstr "As funções não podem aparecer mais do que uma vez"
@@ -12273,9 +12316,6 @@ msgstr "Elemento de função predefinido sem pai"
msgid "Preset sub element without parent"
msgstr "Elemento secundário predefinido sem pai"
-msgid "Could not read tagging preset source: {0}"
-msgstr "Não foi possível ler a fonte do modelo de etiquetas: {0}"
-
msgid "Error parsing {0}: "
msgstr "Erro ao processar {0}: "
@@ -12294,6 +12334,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 (*.*)"
@@ -12329,9 +12379,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 ""
@@ -12368,11 +12468,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."
@@ -12419,40 +12517,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..."
@@ -12555,6 +12640,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}."
@@ -12570,15 +12658,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}."
@@ -12669,8 +12763,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!"
@@ -12777,47 +12871,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 "
@@ -12827,11 +12887,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"
@@ -12859,11 +12917,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>"
@@ -12957,11 +13012,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}."
@@ -13169,10 +13222,14 @@ 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 "RemoteControl::Accepting connections on port {0}"
msgstr "ControloRemoto::Aceitando ligações na porta {0}"
@@ -13219,6 +13276,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."
@@ -13253,20 +13319,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: "
@@ -13287,6 +13353,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"
@@ -13294,6 +13369,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}''."
@@ -13371,18 +13449,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}''"
@@ -13548,12 +13622,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"
@@ -13567,29 +13640,24 @@ 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 ""
"Aviso: não foi possível instalar o módulo ''{0}'' do ficheiro temporário "
"descarregado ''{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 ""
-"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}''"
@@ -13665,11 +13733,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..."
@@ -13683,12 +13748,25 @@ 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 ""
@@ -14146,16 +14224,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}"
+msgid "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}"
+"Failed to access directory ''{0}'' for security reasons. 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 "{0}... [please type its number]"
msgstr "{0}... [por favor digite o seu número]"
@@ -14167,9 +14241,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 "
@@ -14205,8 +14322,22 @@ 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 "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 "
@@ -14553,6 +14684,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 ""
@@ -14866,6 +15002,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."
@@ -14937,9 +15076,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"
@@ -14999,6 +15135,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"
@@ -15165,6 +15306,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"
@@ -15255,6 +15399,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)"
@@ -15273,11 +15461,11 @@ 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 "rua de traseiras"
@@ -15288,6 +15476,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"
@@ -15315,18 +15506,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"
@@ -15336,9 +15521,6 @@ msgstr "Restrições de transporte"
msgid "General Access"
msgstr "Acesso"
-msgid "destination"
-msgstr "destino"
-
msgid "delivery"
msgstr "apenas para entregas de mercadoria"
@@ -15348,15 +15530,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)"
@@ -15402,6 +15584,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)"
@@ -15486,6 +15671,9 @@ msgstr "Editar Ponte"
msgid "viaduct"
msgstr "viaduto"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr "giratória"
@@ -15596,20 +15784,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"
@@ -15626,11 +15823,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"
@@ -15667,8 +15864,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"
@@ -15736,12 +15933,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"
@@ -15757,15 +15960,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"
@@ -15787,6 +15981,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"
@@ -15796,6 +15999,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"
@@ -15805,11 +16011,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...)"
@@ -15841,9 +16044,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"
@@ -15886,6 +16086,12 @@ msgstr "Editar Bloco (cimento / pedra)"
msgid "Allowed traffic:"
msgstr "Trânsito permitido:"
+msgid "Material"
+msgstr "Material"
+
+msgid "stone"
+msgstr "pedra"
+
msgid "Bollard"
msgstr "Pilar"
@@ -15901,6 +16107,9 @@ msgstr ""
msgid "removable"
msgstr "removível"
+msgid "plastic"
+msgstr "plástico"
+
msgid "Cycle Barrier"
msgstr "Chicana Pedestre"
@@ -15970,20 +16179,17 @@ msgstr ""
msgid "electric"
msgstr "eletrificada"
-msgid "roundpole"
-msgstr ""
-
-msgid "split_rail"
-msgstr "toros de madeira cortados"
+msgid "pole"
+msgstr "poste"
-msgid "chain"
-msgstr "rede"
+msgid "Guard Rail"
+msgstr "Railes de proteção da via"
-msgid "hedge"
-msgstr "sebe"
+msgid "Edit Guard Rail"
+msgstr "Editar Railes de proteção da via"
-msgid "pole"
-msgstr "poste"
+msgid "wire"
+msgstr ""
msgid "Guard Rail"
msgstr "Railes de proteção da via"
@@ -16013,8 +16219,9 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr "Fosso / Vala / Trincheira"
+msgctxt "Barrier"
msgid "Edit Ditch"
-msgstr "Editar Fosso / Vala / Trincheira"
+msgstr ""
msgid "Kerb"
msgstr "Lancil (passeio desnivelado sem rampa)"
@@ -16022,11 +16229,11 @@ msgstr "Lancil (passeio desnivelado sem rampa)"
msgid "Edit Kerb"
msgstr "Editar Lancil"
-msgid "Entrance"
-msgstr "Entrada"
+msgid "Entrance (barrier opening)"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Editar Entrada"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Cancela / Portão"
@@ -16145,12 +16352,21 @@ msgstr "Editar Vala de Drenagem"
msgid "Ditch"
msgstr "Fosso / Vala / Trincheira"
+msgid "Edit Ditch"
+msgstr "Editar Fosso / Vala / Trincheira"
+
msgid "Stream"
msgstr "Ribeiro"
msgid "Edit Stream"
msgstr "Editar Ribeiro"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Canal"
@@ -16190,9 +16406,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"
@@ -16226,14 +16439,29 @@ msgstr "Editar Reservatório Coberto"
msgid "Edit Water"
msgstr "Editar Água"
-msgid "Land"
-msgstr "Terra"
+msgid "Water Body"
+msgstr ""
-msgid "Edit Land"
-msgstr "Editar Terra"
+msgid "lake"
+msgstr ""
-msgid "Coastline"
-msgstr "Linha Costeira"
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
+msgid "Land"
+msgstr "Terra"
+
+msgid "Edit Land"
+msgstr "Editar Terra"
+
+msgid "Coastline"
+msgstr "Linha Costeira"
msgid "Edit Coastline"
msgstr "Editar Linha Costeira"
@@ -16307,20 +16535,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"
@@ -16394,8 +16627,8 @@ msgstr "turismo"
msgid "freight"
msgstr "carga"
-msgid "Service/Type"
-msgstr "Serviço/Tipo"
+msgid "Service type"
+msgstr ""
msgid "yard"
msgstr "pátio de manobras ferroviárias"
@@ -16418,11 +16651,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 (Hz)"
-msgstr "Frequência (Hz)"
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
+
+msgid "16.67"
+msgstr ""
msgid "16.7"
msgstr "16.7"
@@ -16433,9 +16669,6 @@ msgstr "Carril Bitola Estreita"
msgid "Edit Narrow Gauge Rail"
msgstr "Editar Carril Bitola Estreita"
-msgid "Types"
-msgstr "Tipos"
-
msgid "Monorail"
msgstr "Monocarril"
@@ -16487,6 +16720,9 @@ msgstr "Editar Ferrovia Abandonada"
msgid "Level Crossing"
msgstr "Passagem de Nível Ferroviária"
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr "Vigiado"
@@ -16499,18 +16735,32 @@ 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 "médio"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "alto"
+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"
@@ -16610,13 +16860,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"
@@ -16626,13 +16874,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"
@@ -16649,12 +16895,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"
@@ -16682,9 +16928,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"
@@ -16706,11 +16949,30 @@ 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 "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Terça-Dom 8h-15h; Sáb 8h-12h"
+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 Parq. Est. (subterrâneo/vários pisos)"
@@ -16859,6 +17121,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"
@@ -16880,6 +17145,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"
@@ -16907,6 +17178,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"
@@ -16931,22 +17208,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"
@@ -16968,9 +17229,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Peças"
-
msgid "Clothes"
msgstr "Roupas"
@@ -17165,6 +17423,9 @@ msgstr "Plataforma"
msgid "Station or amenities"
msgstr "Estação ou infraestruturas"
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr "Autocarro"
@@ -17195,6 +17456,9 @@ msgstr "Funicular"
msgid "Ferry"
msgstr "Ferry"
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Banco"
@@ -17207,9 +17471,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)"
@@ -17219,8 +17480,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"
@@ -17234,6 +17500,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"
@@ -17258,14 +17527,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"
@@ -17314,8 +17575,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"
@@ -17368,6 +17629,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"
@@ -17390,21 +17666,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"
@@ -17594,9 +17855,6 @@ msgstr "Clube de striptease"
msgid "Edit Stripclub"
msgstr "Editar Clube de striptease"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Terça-Dom 8h-15h; Sáb 8h-12h"
-
msgid "Tourism"
msgstr "Turismo"
@@ -17618,9 +17876,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"
@@ -17633,6 +17897,9 @@ msgstr "estradas"
msgid "scheme"
msgstr "esquemático (apresenta só o mais importante)"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Área Mostrada"
@@ -17672,6 +17939,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"
@@ -17693,23 +17963,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"
@@ -17838,50 +18120,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"
@@ -17898,6 +18174,12 @@ msgstr "católica"
msgid "evangelical"
msgstr "evangélica"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "testemunhas de jeová"
@@ -17910,6 +18192,9 @@ msgstr "metodista"
msgid "mormon"
msgstr "mórmon"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ortodoxa"
@@ -17928,41 +18213,141 @@ msgstr "quaker"
msgid "roman_catholic"
msgstr "Católica Romana"
-msgid "shia"
-msgstr "xiismo"
+msgid "russian_orthodox"
+msgstr ""
-msgid "sunni"
-msgstr "sunismo"
+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 "Public Building"
-msgstr "Edifício Público"
+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"
msgid "Edit Public Building"
msgstr "Editar Edifício Público"
@@ -18048,6 +18433,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"
@@ -18129,12 +18520,66 @@ msgstr "Veterinário"
msgid "Edit Veterinary"
msgstr "Editar Veterinário"
-msgid "Drinking water"
+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"
@@ -18144,6 +18589,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"
@@ -18153,31 +18622,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"
@@ -18205,8 +18680,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)"
@@ -18232,21 +18707,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 "plastic"
-msgstr "plástico"
-
msgid "Amount of Seats"
msgstr "Número de Assentos"
@@ -18281,8 +18750,17 @@ msgstr "Editar Plataforma de Caça"
msgid "Height"
msgstr "Altura (metros)"
+msgctxt "height"
msgid "low"
-msgstr "baixo"
+msgstr ""
+
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
msgid "Hide"
msgstr "Escondido"
@@ -18290,9 +18768,6 @@ 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"
@@ -18324,6 +18799,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"
@@ -18361,119 +18839,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"
@@ -18505,26 +19019,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"
@@ -18532,6 +19047,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)"
@@ -18565,6 +19089,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"
@@ -18621,7 +19161,7 @@ msgid "Skating"
msgstr "Patinagem no Gelo"
msgid "Edit Skating"
-msgstr "Editar Patinagem no Gelo"
+msgstr ""
msgid "ice_rink"
msgstr "curling bávaro"
@@ -18665,36 +19205,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 "clássico"
+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 ""
@@ -18737,21 +19295,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)"
@@ -18888,6 +19442,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"
@@ -18900,38 +19466,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 "transporte"
+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"
@@ -18939,20 +19540,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"
@@ -19178,42 +19818,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 Measurement Station"
-msgstr "Editar Estação de Medição (meteorológica, sísmica, nível da água...)"
+msgid "Edit Monitoring Station"
+msgstr ""
-msgid "Measurement"
-msgstr "Tipo de Medição"
+msgid "Monitoring:"
+msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
-msgstr "sísmica"
+msgid "Water level"
+msgstr ""
-msgid "water_level"
-msgstr "nível da água"
+msgid "Tide Level"
+msgstr ""
-msgid "weather"
-msgstr "tempo"
+msgid "Traffic"
+msgstr ""
-msgid "Recording"
-msgstr "Gravação"
+msgid "Air Quality"
+msgstr ""
-msgid "manually"
-msgstr "manual"
+msgid "Noise"
+msgstr ""
-msgid "automated"
-msgstr "automatizada"
+msgid "GPS Signals"
+msgstr ""
-msgid "remote"
-msgstr "remota"
+msgid "GLONASS Signals"
+msgstr ""
-msgctxt "display"
-msgid "no"
-msgstr "não"
+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 "Vértice Geodésico"
@@ -19221,8 +19887,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"
@@ -19233,12 +19899,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)"
@@ -19290,89 +20046,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 "barragem sem reservatório"
+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 "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 "Carregamento de baterias"
+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)"
@@ -19383,6 +20242,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"
@@ -19398,6 +20272,9 @@ msgstr "Editar Torre de Alta Tensão"
msgid "Tower reference"
msgstr "Referência da torre"
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr "Poste"
@@ -19416,13 +20293,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"
@@ -19529,11 +20404,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"
@@ -19544,8 +20419,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"
@@ -19565,6 +20440,9 @@ 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"
@@ -19577,9 +20455,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr "Editar Quitanda/Venda"
-msgid "Organic"
-msgstr "Orgânica / Biológica"
-
msgid "Edit Organic/Bio"
msgstr "Editar Orgânica / Biológica"
@@ -19649,8 +20524,8 @@ msgstr "Editar Alfaiate"
msgid "Fabric"
msgstr "Tecidos"
-msgid "Edit Fabric"
-msgstr "Editar Tecidos"
+msgid "Edit Fabric Shop"
+msgstr ""
msgid "Electronic"
msgstr "Eletrónica"
@@ -19670,14 +20545,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"
@@ -19685,9 +20560,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"
@@ -19713,6 +20587,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"
@@ -19749,11 +20629,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"
@@ -19782,8 +20683,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"
@@ -19794,20 +20695,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"
@@ -19842,8 +20743,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"
@@ -20052,8 +20953,14 @@ msgstr "Editar Sítio (evitar usar)"
msgid "Peak"
msgstr "Cume"
-msgid "Edit Peak"
-msgstr "Editar Cume"
+msgid "Edit Peak"
+msgstr "Editar Cume"
+
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
msgid "Glacier"
msgstr "Glaciar"
@@ -20094,24 +21001,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"
@@ -20121,15 +21037,6 @@ 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 "Pradaria"
@@ -20205,6 +21112,12 @@ msgstr "Prado"
msgid "Edit Meadow Landuse"
msgstr "Editar Prado"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Vinha"
@@ -20259,8 +21172,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"
@@ -20271,6 +21184,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"
@@ -20346,6 +21262,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"
@@ -20382,6 +21325,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)"
@@ -20550,20 +21505,49 @@ msgstr "Rota"
msgid "Edit general route"
msgstr "Editar Rota"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+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"
@@ -20610,20 +21594,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"
@@ -20646,8 +21633,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)"
@@ -20742,18 +21729,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"
@@ -20763,8 +21759,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"
@@ -20772,11 +21771,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"
@@ -20793,6 +21792,9 @@ msgstr "rápidos"
msgid "railwaypoint"
msgstr "ponto na ferrovia"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr "pátio de manobras ferroviárias"
@@ -20808,29 +21810,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"
@@ -20850,20 +21852,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"
@@ -20937,11 +21939,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"
@@ -20955,9 +21960,6 @@ msgstr "Aldeia / Cidade"
msgid "One Way"
msgstr "Sentido Único"
-msgid "Church"
-msgstr "Igreja"
-
msgid "Fuel Station"
msgstr "Posto de Combustível"
@@ -20985,6 +21987,9 @@ 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 "estrada sem classificação oficial que não tem nome"
@@ -21033,11 +22038,41 @@ 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 "incline without highway"
-msgstr "incline (inclinação) sem etiqueta highway (via)"
+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"
msgstr ""
@@ -21048,7 +22083,7 @@ 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"
@@ -21066,8 +22101,8 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
-msgstr "oneway (sentido único) sem etiqueta highway (via)"
+msgid "oneway without highway or railway"
+msgstr ""
msgid "sac_scale without highway"
msgstr "sac_scale (escala SAC) highway (via)"
@@ -21183,23 +22218,134 @@ 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 ""
"tunnel (túnel) sem etiqueta highway/railway/waterway (via/ferrovia/curso de "
"água)"
-msgid "bridge without highway/railway/waterway"
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
msgstr ""
"bridge (ponte) sem etiqueta highway/railway/waterway (via/ferrovia/curso de "
"água)"
-msgid "psv without highway/railway/waterway"
+msgid "psv without highway/railway/waterway/parking"
msgstr ""
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"
@@ -21219,8 +22365,47 @@ msgid ""
msgstr ""
"sem indicação da língua na Wikipédia, usar ''wikipedia''=''língua:página''"
-msgid "unkown language prefix in wikipedia tag"
-msgstr "prefixo de língua da Wikipédia desconhecido"
+msgid "unknown language prefix in wikipedia tag"
+msgstr ""
+
+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 "Landsat"
msgstr ""
@@ -21231,19 +22416,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 "skobbler heatmap"
@@ -21264,13 +22458,16 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
+msgid "basemap.at"
msgstr ""
msgid "Graz: Basiskarte (base map)"
@@ -21419,6 +22616,29 @@ 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 ""
@@ -21584,6 +22804,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -21629,6 +22852,39 @@ msgstr ""
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 "Export"
+msgstr "Exportar"
+
+msgid "Port:"
+msgstr "Porta:"
+
+msgid "refresh the port list"
+msgstr "atualizar a lista de porta"
+
+msgid "Configure"
+msgstr "Configurar"
+
+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 "Columbus V-900 CSV Files"
msgstr "Ficheiros CSV Columbus V-900 - Visiontac VGPS-900"
@@ -21841,6 +23097,18 @@ 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 o painel de contornos de elevação."
@@ -21862,14 +23130,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}''."
@@ -22146,11 +23408,14 @@ 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 "Housenumber increment:"
-msgstr "Incremento no 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"
@@ -22363,8 +23628,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"
@@ -22741,15 +24006,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"
@@ -22942,6 +24198,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."
@@ -22961,12 +24220,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "alto"
-
-msgid "medium"
-msgstr "médio"
-
msgid "symbol"
msgstr "símbolo"
@@ -23118,6 +24371,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:"
@@ -23139,6 +24395,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?"
@@ -23389,8 +24648,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."
@@ -23443,8 +24705,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"
@@ -23672,27 +24934,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."
@@ -24828,9 +26072,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"
@@ -25563,9 +26832,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 "Process queue"
msgstr "Enviar alterações"
@@ -25624,18 +26890,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"
@@ -25989,6 +27243,27 @@ msgid "Test failed: Could not write mtime."
msgstr ""
"O teste falhou: não foi possível gravar a hora de modificação (mtime)."
+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}?"
@@ -26144,6 +27419,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: "
@@ -26471,9 +27750,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;"
@@ -26698,6 +27974,9 @@ 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}"
msgstr "Falta o alvo da fusão para {0} com o identificador {1}"
@@ -26734,15 +28013,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 ""
@@ -26861,9 +28160,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)"
@@ -27071,20 +28367,20 @@ 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"
-msgstr "Exportar"
+msgid "Select a map object"
+msgstr ""
msgid "AutoSave LiveData"
msgstr "Gravar Automaticamente"
@@ -27314,6 +28610,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"
@@ -27356,6 +28741,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..."
@@ -27526,9 +28914,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:"
@@ -28701,9 +30086,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"
@@ -29010,9 +30392,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 92728dd..7d37ea5 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-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-07-19 23:48+0000\n"
-"Last-Translator: Blademir <blademirtc at hotmail.com>\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-08-05 05:05+0000\n"
-"X-Generator: Launchpad (build 16718)\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"
@@ -50,6 +50,9 @@ 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}"
@@ -59,6 +62,9 @@ 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"
@@ -164,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 "
@@ -266,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"
@@ -305,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}"
@@ -361,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"
@@ -551,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)"
@@ -678,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"
@@ -850,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"
@@ -1058,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 "
@@ -1087,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>"
@@ -1272,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"
@@ -1426,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"
@@ -1538,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"
@@ -1837,6 +1844,28 @@ 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 "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 {0} of {1} ({2} left)"
msgstr "Baixando {0} de {1} (faltam {2})"
@@ -2080,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] "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 ""
@@ -2547,6 +2576,9 @@ 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 "elementos de combinação"
@@ -2756,11 +2788,8 @@ 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 "
@@ -2855,6 +2884,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}"
@@ -2891,11 +2923,11 @@ 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"
-msgstr "Deletadas{0} propriedades para {1} objetos"
+msgid "Deleted {0} tags for {1} objects"
+msgstr ""
-msgid "Set {0} properties for {1} objects"
-msgstr "Determinar {0} propriedades para {1} objetos"
+msgid "Set {0} tags for {1} objects"
+msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "Substituir \"{0}\" por \"{1}\" para"
@@ -2919,11 +2951,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}\""
@@ -3040,6 +3070,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ó"
@@ -3106,11 +3139,9 @@ msgid "Reverse directional way."
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"
@@ -3139,11 +3170,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"
@@ -3168,6 +3199,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}"
@@ -3198,22 +3232,20 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
-msgstr "Aviso: Falha ao criar o diretório de cache que faltava: {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 "
@@ -3223,11 +3255,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 "
@@ -3236,18 +3266,14 @@ 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 ""
"Informação: Falta arquivo de preferências ''{0}''. Criando arquivo 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} com o "
-"ficheiro de preferência base."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3265,8 +3291,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 ""
"Aviso: Falha ao inicializar preferências. Falha ao redefinir arquivo de "
"preferências para o padrão: {0}"
@@ -3299,14 +3325,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}\""
@@ -3472,8 +3495,7 @@ 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 ""
"Erro: falha ao carregar o renderizador de mapa classe ''{0}''. A classe não "
"foi encontrada."
@@ -3584,7 +3606,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3622,9 +3644,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr "WGS84"
@@ -3665,6 +3684,9 @@ msgstr "validar outro"
msgid "Running test {0}"
msgstr "Executando teste {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Endereços"
@@ -3689,6 +3711,15 @@ 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"
msgstr ""
@@ -3750,6 +3781,9 @@ 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"
msgstr "Nós duplicados"
@@ -3834,6 +3868,15 @@ 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"
@@ -3904,6 +3947,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 ""
@@ -3963,15 +4012,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})"
@@ -4004,11 +4053,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}"
@@ -4150,8 +4199,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"
@@ -4226,6 +4275,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}"
@@ -4256,9 +4308,6 @@ msgstr "prédio"
msgid "area"
msgstr "área"
-msgid "Unclosed way"
-msgstr "Via fechada"
-
msgid "Unconnected ways"
msgstr ""
@@ -4285,12 +4334,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''"
@@ -4352,26 +4401,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)"
@@ -4475,7 +4504,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"
@@ -4721,6 +4750,18 @@ 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"
@@ -4827,21 +4868,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 ""
@@ -5145,6 +5171,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."
@@ -5152,6 +5181,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."
@@ -5159,18 +5191,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."
@@ -5178,6 +5219,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"
@@ -5194,8 +5238,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"
@@ -5250,16 +5294,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ó"
@@ -5518,18 +5552,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 "
@@ -6082,6 +6113,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"
@@ -6165,6 +6199,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"
@@ -6256,11 +6320,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 "
@@ -6440,9 +6501,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 ""
@@ -6780,11 +6838,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 ""
@@ -6854,35 +6910,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"
@@ -6896,13 +6964,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)"
@@ -7056,7 +7124,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"
@@ -7390,14 +7458,34 @@ 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 "Bookmarks"
-msgstr "Favoritos"
+msgid "{0} - {1} ({2})"
+msgstr ""
-msgid "<html>There is currently no download area selected.</html>"
-msgstr "<html>Nenhuma área foi selecionada para download.</html>"
+msgid "Wrong number of arguments for bookmark"
+msgstr "Número de argumentos para marcador errado"
-msgid ""
-"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+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"
+
+msgid "<html>There is currently no download area selected.</html>"
+msgstr "<html>Nenhuma área foi selecionada para download.</html>"
+
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
"maxlat): </html>"
msgstr ""
"<html><strong>Atual área de download</strong> (minlon, minlat, maxlon, "
@@ -7533,21 +7621,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, "
@@ -7559,28 +7634,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"
@@ -7685,8 +7741,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."
@@ -7793,6 +7849,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"
@@ -7898,9 +7957,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"
@@ -7918,8 +7976,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:"
@@ -7990,11 +8054,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"
@@ -8075,8 +8136,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 ""
@@ -8094,11 +8155,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 ""
@@ -8337,12 +8395,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 "
@@ -8357,6 +8409,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"
@@ -8373,6 +8441,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"
@@ -8380,11 +8463,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 ""
@@ -8522,9 +8603,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..."
@@ -8536,6 +8614,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>"
@@ -8556,9 +8637,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:"
@@ -8712,7 +8792,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8742,8 +8822,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"
@@ -9116,9 +9196,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..."
@@ -9138,6 +9215,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"
@@ -9197,6 +9277,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"
@@ -9272,9 +9358,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 ""
@@ -9469,15 +9552,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 ""
@@ -9491,9 +9570,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"
@@ -9502,11 +9580,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>"
@@ -9770,8 +9845,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}''"
@@ -10545,7 +10620,7 @@ msgstr ""
msgid "Advanced Background: Changed"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid "Advanced Background: NonDefault"
msgstr ""
msgid "Current value is default."
@@ -10615,6 +10690,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 ""
@@ -10673,6 +10751,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 ""
@@ -11151,6 +11234,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"
@@ -11220,8 +11309,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"
@@ -11495,21 +11584,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"
@@ -11531,6 +11605,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}\""
@@ -11598,8 +11687,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:"
@@ -11608,28 +11697,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 ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
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 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. "
@@ -11720,18 +11807,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 ""
@@ -11803,8 +11881,8 @@ msgstr "Aplicar Preferência"
msgid "New relation"
msgstr "Nova relação"
-msgid "Change Properties"
-msgstr "Alterar propriedades"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr "Requisito desconhecido: {0}"
@@ -11882,9 +11960,6 @@ msgstr ""
msgid "Preset sub element without parent"
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}: "
@@ -11903,6 +11978,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 ""
@@ -11937,9 +12022,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 ""
@@ -11970,11 +12104,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."
@@ -12014,33 +12146,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 ""
@@ -12138,6 +12264,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."
@@ -12153,15 +12282,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 ""
@@ -12240,8 +12375,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"
@@ -12341,59 +12476,28 @@ 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}''."
+"Unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
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}''."
+"Illegal document structure. Found node, way, or relation outside of "
+"''create'', ''modify'', or ''delete''."
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}''."
+msgid ""
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgid "Parsing changeset content ..."
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 "
-"({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}''."
@@ -12414,12 +12518,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 ""
@@ -12501,8 +12602,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}."
@@ -12707,7 +12808,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 "RemoteControl::Accepting connections on port {0}"
@@ -12755,6 +12862,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."
@@ -12785,19 +12901,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 ""
@@ -12819,11 +12935,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 ""
@@ -12893,18 +13021,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}\""
@@ -13056,11 +13180,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"
@@ -13074,24 +13198,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}''"
@@ -13166,8 +13287,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..."
@@ -13182,9 +13302,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}''"
@@ -13520,12 +13655,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 "Failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
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 ""
msgid "{0}... [please type its number]"
@@ -13536,9 +13670,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 ""
@@ -13570,9 +13747,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."
@@ -13900,6 +14091,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 ""
@@ -14150,6 +14346,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."
@@ -14201,9 +14400,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 ""
@@ -14240,6 +14436,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 ""
@@ -14372,6 +14573,9 @@ msgstr "Barragem"
msgid "Lit"
msgstr "Iluminado"
+msgid "Toll"
+msgstr "Pedágio"
+
msgid "Motorway Link"
msgstr "Ligação para auto-estrada"
@@ -14462,6 +14666,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"
@@ -14480,11 +14728,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 ""
@@ -14495,6 +14743,9 @@ msgstr ""
msgid "parking_aisle"
msgstr "corredor_de_estacionamento"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Vaga de Estacionamento"
@@ -14522,18 +14773,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"
@@ -14543,9 +14788,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr "Destino"
-
msgid "delivery"
msgstr ""
@@ -14555,15 +14797,15 @@ msgstr "permitido"
msgid "private"
msgstr "privado"
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr ""
msgid "forestry"
msgstr ""
-msgid "no"
-msgstr "não"
-
msgid "official"
msgstr ""
@@ -14609,6 +14851,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)"
@@ -14693,6 +14938,9 @@ msgstr "Editar Ponte"
msgid "viaduct"
msgstr "viaduto"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -14797,21 +15045,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 ""
@@ -14827,11 +15084,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"
@@ -14866,7 +15123,7 @@ msgstr "Ciclovia na direita"
msgid "Oneway (bicycle)"
msgstr "Mão única (bicicleta)"
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -14935,12 +15192,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"
@@ -14956,15 +15219,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 ""
@@ -14986,6 +15240,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"
@@ -14995,6 +15258,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Mini-rotatória"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Direção"
@@ -15004,10 +15270,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"
@@ -15040,9 +15303,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"
@@ -15085,6 +15345,12 @@ msgstr "Editar Bloco"
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr "rocha"
+
msgid "Bollard"
msgstr ""
@@ -15100,6 +15366,9 @@ msgstr ""
msgid "removable"
msgstr "removível"
+msgid "plastic"
+msgstr "plástico"
+
msgid "Cycle Barrier"
msgstr "Barreira para bicicletas"
@@ -15169,21 +15438,18 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
-msgstr ""
+msgid "pole"
+msgstr "polo"
-msgid "split_rail"
+msgid "Guard Rail"
msgstr ""
-msgid "chain"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "hedge"
+msgid "wire"
msgstr ""
-msgid "pole"
-msgstr "polo"
-
msgid "Guard Rail"
msgstr ""
@@ -15212,8 +15478,9 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
-msgstr "Editar Canal Artificial"
+msgstr ""
msgid "Kerb"
msgstr ""
@@ -15221,11 +15488,11 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
-msgstr "Entrada"
+msgid "Entrance (barrier opening)"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Editar Entrada"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr ""
@@ -15278,12 +15545,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr "rocha"
-
msgid "Turnstile"
msgstr ""
@@ -15344,12 +15605,21 @@ msgstr "Editar Dreno/Ralo"
msgid "Ditch"
msgstr "Canal Artificial"
+msgid "Ditch"
+msgstr "Canal Artificial"
+
msgid "Stream"
msgstr "Córrego"
msgid "Edit Stream"
msgstr "Editar Córrego"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -15389,9 +15659,6 @@ msgstr "Editar Barragem"
msgid "Groyne"
msgstr "Quebra-mar"
-msgid "Edit Groyne"
-msgstr "Editar Quebra-mar"
-
msgid "Breakwater"
msgstr ""
@@ -15425,7 +15692,22 @@ msgstr ""
msgid "Edit Water"
msgstr "Editar Água"
-msgid "Land"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
+msgid "Land"
msgstr ""
msgid "Edit Land"
@@ -15506,18 +15788,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 ""
@@ -15593,7 +15880,7 @@ msgstr "turismo"
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -15617,11 +15904,14 @@ 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"
@@ -15632,9 +15922,6 @@ msgstr "Bitola Estreita"
msgid "Edit Narrow Gauge Rail"
msgstr "Editar Bitola Estreita"
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr "Monotrilho"
@@ -15683,7 +15970,25 @@ msgstr "Ferrovia Abandonada"
msgid "Edit Abandoned Railway"
msgstr "Editar Ferrovia Abandonada"
-msgid "Level Crossing"
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgid "half"
+msgstr "metade"
+
+msgid "full"
+msgstr "cheio"
+
+msgid "double_half"
+msgstr ""
+
+msgid "Edit Level Crossing"
msgstr ""
msgid "Supervised"
@@ -15698,18 +16003,32 @@ msgstr ""
msgid "Barrier"
msgstr ""
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
msgid "half"
-msgstr "metade"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "cheio"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "double_half"
msgstr ""
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -15809,11 +16128,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -15825,11 +16142,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -15848,12 +16163,12 @@ msgstr ""
msgid "underground"
msgstr "subterrâneo"
+msgid "rooftop"
+msgstr ""
+
msgid "Access"
msgstr "Acesso"
-msgid "customers"
-msgstr ""
-
msgid "Park and Ride"
msgstr ""
@@ -15881,9 +16196,6 @@ msgstr "Vaga de Estacionamento"
msgid "Edit Parking space"
msgstr "Editar Vaga de Estacionamento"
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Capacidade"
@@ -15905,10 +16217,29 @@ msgstr "Horário de Funcionamento"
msgid "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 "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"
@@ -16058,6 +16389,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr "Voltagem"
+
msgid "Amperage"
msgstr ""
@@ -16079,6 +16413,12 @@ msgstr "Oficina"
msgid "Edit Car Repair"
msgstr "Editar Oficina"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr "Borracharia"
@@ -16106,6 +16446,12 @@ msgstr "Aluguel"
msgid "Edit Car Rental"
msgstr "Editar Aluguel de Carros"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "Compartilhamento"
@@ -16130,22 +16476,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 ""
@@ -16167,9 +16497,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Roupas"
@@ -16364,6 +16691,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -16394,6 +16724,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Banco"
@@ -16406,9 +16739,6 @@ msgstr "Cadeira de Rodas"
msgid "limited"
msgstr "limitado"
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -16418,9 +16748,14 @@ msgstr "Plataforma Ferroviária"
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr "Edificação"
@@ -16433,6 +16768,9 @@ msgstr "Editar Entrada do Metrô"
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -16457,14 +16795,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 ""
@@ -16513,8 +16843,8 @@ 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"
@@ -16567,6 +16897,21 @@ 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 "Portão"
@@ -16589,21 +16934,6 @@ 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 "Taxa de Acesso a Internet"
-
msgid "Smoking"
msgstr ""
@@ -16793,9 +17123,6 @@ msgstr ""
msgid "Edit Stripclub"
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 "Tourism"
msgstr "Turismo"
@@ -16817,9 +17144,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 ""
@@ -16832,6 +17165,9 @@ msgstr "estrada"
msgid "scheme"
msgstr "esquema"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -16871,6 +17207,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 ""
@@ -16892,23 +17231,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"
@@ -17037,50 +17388,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"
@@ -17097,6 +17442,12 @@ msgstr "católica"
msgid "evangelical"
msgstr "evangélica"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "testemunha de jeová"
@@ -17109,6 +17460,9 @@ msgstr "metodista"
msgid "mormon"
msgstr "mórmon"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ortodoxa"
@@ -17127,50 +17481,150 @@ msgstr "quaker"
msgid "roman_catholic"
msgstr ""
-msgid "shia"
-msgstr "xiismo"
+msgid "russian_orthodox"
+msgstr ""
-msgid "sunni"
-msgstr "sunismo"
+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 "Prédio Público"
+msgid "Edit Mosque"
+msgstr ""
-msgid "Edit Public Building"
-msgstr "Editar Prédio Público"
+msgid "mosque"
+msgstr ""
-msgid "Town hall"
-msgstr "Prefeitura"
+msgid "ibadi"
+msgstr ""
-msgid "Edit Town hall"
-msgstr "Editar Prefeitura"
+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"
+
+msgid "Edit Public Building"
+msgstr "Editar Prédio Público"
+
+msgid "Town hall"
+msgstr "Prefeitura"
+
+msgid "Edit Town hall"
+msgstr "Editar Prefeitura"
msgid "Community Centre"
msgstr ""
@@ -17247,6 +17701,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"
@@ -17328,12 +17788,66 @@ msgstr "Veterinária"
msgid "Edit Veterinary"
msgstr "Editar Veterinária"
-msgid "Drinking water"
-msgstr "Água Potável"
+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"
@@ -17343,6 +17857,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"
@@ -17352,31 +17890,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 ""
@@ -17404,8 +17948,8 @@ msgstr ""
msgid "Recycling"
msgstr "Reciclagem"
-msgid "Edit Recycling station"
-msgstr "Editar Centro de Reciclagem"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Baterias"
@@ -17431,21 +17975,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 "plastic"
-msgstr "plástico"
-
msgid "Amount of Seats"
msgstr "Número de Assentos"
@@ -17480,8 +18018,17 @@ msgstr "Editar estande de caça"
msgid "Height"
msgstr "Altura"
+msgctxt "height"
msgid "low"
-msgstr "baixa"
+msgstr ""
+
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
msgid "Hide"
msgstr "Ocutar"
@@ -17489,9 +18036,6 @@ msgstr "Ocutar"
msgid "Lock"
msgstr "Bloquear"
-msgid "Drinking Water"
-msgstr "Bebedouro"
-
msgid "Edit Source of Potable Water"
msgstr "Editar Fonte da Água Potável"
@@ -17523,6 +18067,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -17560,119 +18107,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 "clube de 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"
@@ -17704,26 +18287,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 ""
@@ -17731,6 +18315,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "campo"
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr "estádio"
+
msgid "10pin"
msgstr ""
@@ -17764,6 +18357,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 ""
@@ -17864,36 +18473,54 @@ 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 ""
@@ -17936,19 +18563,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 ""
@@ -18087,6 +18710,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 ""
@@ -18099,60 +18734,134 @@ msgstr "Construção humana"
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr "garagem"
-msgid "church"
-msgstr "igreja"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+msgctxt "building"
msgid "school"
msgstr "escola"
+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 "estufa"
+msgctxt "building"
msgid "office"
msgstr "escritório"
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
-msgstr "Edifício Residencial"
+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 "Edifício Residencial"
+
+msgid "Edit Residential Building"
msgstr "Editar Edifício Residencial"
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr "apartamento"
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr "cabana"
+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"
@@ -18377,41 +19086,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"
@@ -18420,8 +19155,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"
@@ -18432,12 +19167,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"
@@ -18489,89 +19314,192 @@ 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 "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 "battery charging"
+msgid "Boiling Water Reactor 5 (BWR-5)"
msgstr ""
-msgid "Power Station"
-msgstr "Estação de Energia"
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Editar Estação de Energia"
+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"
@@ -18582,6 +19510,21 @@ 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 ""
@@ -18597,6 +19540,9 @@ msgstr "Editar Torre de Energia"
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -18615,11 +19561,9 @@ 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 ""
@@ -18728,11 +19672,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"
@@ -18743,8 +19687,8 @@ msgstr "Editar Açougue"
msgid "Seafood"
msgstr "Frutos do Mar"
-msgid "Edit Seafood"
-msgstr "Editar Frutos do Mar"
+msgid "Edit Seafood Shop"
+msgstr ""
msgid "Deli (Fine Food)"
msgstr ""
@@ -18764,6 +19708,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr "Orgânicos"
+
msgid "Greengrocer"
msgstr ""
@@ -18776,9 +19723,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr "Orgânicos"
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -18848,7 +19792,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -18869,13 +19813,13 @@ msgstr "Editar Loja de Eletrônicos"
msgid "Mobile Phone"
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"
@@ -18884,9 +19828,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"
@@ -18912,6 +19855,12 @@ msgstr "Editar Loja de Câmbio"
msgid "Edit Automated Teller Machine"
msgstr "Editar Caixa Eletrônico"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr "Loja de Departamentos"
@@ -18936,22 +19885,43 @@ msgstr "Cabelereiro"
msgid "Edit Hairdresser"
msgstr "Editar Cabelereiro"
-msgid "Optician"
-msgstr "Óculos"
+msgid "Optician"
+msgstr "Óculos"
+
+msgid "Edit Optician"
+msgstr "Editar Loja de Óculos"
+
+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 "Edit Optician"
-msgstr "Editar Loja de Óculos"
+msgid "hindu"
+msgstr "hinduísmo"
-msgid "Jewelry"
-msgstr ""
+msgid "jewish"
+msgstr "judaísmo"
-msgid "Edit Jewelry"
-msgstr "Editar Joalheria"
+msgid "muslim"
+msgstr "muçulmano"
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -18981,7 +19951,7 @@ msgstr "Editar Loja de Utilidades Domésticas"
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18993,19 +19963,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"
@@ -19041,7 +20011,7 @@ msgstr "Editar Agência de Viagem"
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -19254,6 +20224,12 @@ msgstr "Pico"
msgid "Edit Peak"
msgstr "Editar Pico"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Geleira"
@@ -19293,26 +20269,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 "conífera"
-msgctxt "wood"
msgid "deciduous"
msgstr "decídua"
-msgctxt "wood"
msgid "mixed"
-msgstr ""
+msgstr "misturado"
msgid "Forest"
msgstr "Floresta"
@@ -19320,15 +20305,6 @@ msgstr "Floresta"
msgid "Edit Forest Landuse"
msgstr "Editar zona Florestal"
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr "decídua"
-
-msgid "mixed"
-msgstr "misturado"
-
msgid "Grassland"
msgstr ""
@@ -19404,6 +20380,12 @@ msgstr "Prados"
msgid "Edit Meadow Landuse"
msgstr "Editar Zona de prados"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Vinhedo"
@@ -19458,8 +20440,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"
@@ -19470,6 +20452,9 @@ msgstr "Cemitério Paroquial"
msgid "Edit Graveyard"
msgstr "Editar Cemitério Paroquial"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Cemitério"
@@ -19545,6 +20530,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"
@@ -19581,6 +20593,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 ""
@@ -19749,20 +20773,49 @@ msgstr ""
msgid "Edit general route"
msgstr ""
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+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"
@@ -19809,19 +20862,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"
@@ -19845,7 +20901,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -19941,18 +20997,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"
@@ -19962,8 +21027,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"
@@ -19971,10 +21039,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"
@@ -19992,6 +21060,9 @@ msgstr ""
msgid "railwaypoint"
msgstr "ponto de ferrovia"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr "pátio ferroviário"
@@ -20007,29 +21078,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"
@@ -20049,20 +21120,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"
@@ -20136,10 +21207,13 @@ msgstr "rota"
msgid "boundary"
msgstr "limite"
+msgid "sport"
+msgstr "esporte"
+
msgid "place"
msgstr "lugar"
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -20154,9 +21228,6 @@ msgstr "Vilarejo/Cidade"
msgid "One Way"
msgstr "Mão única"
-msgid "Church"
-msgstr "Igreja"
-
msgid "Fuel Station"
msgstr "Posto de Gasolina"
@@ -20184,6 +21255,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -20229,10 +21303,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"
@@ -20244,7 +21348,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"
@@ -20262,7 +21366,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -20379,19 +21483,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 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"
@@ -20410,7 +21625,46 @@ 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 "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 "Landsat"
@@ -20422,19 +21676,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 "skobbler heatmap"
@@ -20455,7 +21718,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -20464,6 +21727,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -20610,6 +21876,29 @@ 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 ""
@@ -20775,6 +22064,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -20820,6 +22112,39 @@ msgstr ""
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 "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"
@@ -21026,6 +22351,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 ""
@@ -21047,14 +22384,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 ""
@@ -21318,10 +22649,13 @@ 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 "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -21526,8 +22860,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"
@@ -21799,15 +23133,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 ""
@@ -21980,6 +23305,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."
@@ -21998,12 +23326,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr "símbolo"
@@ -22151,6 +23473,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 ""
@@ -22170,6 +23495,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?"
@@ -22400,7 +23728,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."
@@ -22450,7 +23781,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -22677,27 +24008,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."
@@ -23778,9 +25091,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 ""
@@ -24429,9 +25766,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Um erro ocorreu: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -24484,18 +25818,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 ""
@@ -24846,6 +26168,27 @@ 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 "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 ""
@@ -24997,6 +26340,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 ""
@@ -25314,9 +26660,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr "Trilhas"
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -25532,6 +26875,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}"
@@ -25564,15 +26910,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 ""
@@ -25687,9 +27049,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)"
@@ -25868,19 +27227,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"
@@ -26099,6 +27458,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"
@@ -26135,6 +27583,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..."
@@ -26287,9 +27738,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -27301,9 +28749,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr "Vídeo"
-
msgid "Import Video"
msgstr "Importar vídeo"
@@ -27585,9 +29030,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 4c56469..8d7e3cb 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-08-04 03:41+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-08-05 04:56+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 ""
@@ -250,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -289,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -343,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 ""
@@ -523,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -636,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 ""
@@ -786,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"
@@ -972,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 ""
@@ -995,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>"
@@ -1163,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1304,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"
@@ -1399,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 ""
@@ -1683,6 +1703,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1902,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] ""
@@ -2328,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 ""
@@ -2524,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 ""
@@ -2611,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 ""
@@ -2647,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"
@@ -2673,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}''"
@@ -2778,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] ""
@@ -2838,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"
@@ -2869,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"
@@ -2893,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 ""
@@ -2923,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 ""
@@ -2943,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 ""
@@ -2952,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 ""
@@ -2972,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}"
@@ -3003,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}''."
@@ -3160,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 ""
@@ -3268,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 ""
@@ -3306,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3347,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3371,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 ""
@@ -3430,6 +3469,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3512,6 +3554,15 @@ 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 ""
@@ -3581,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 ""
@@ -3638,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})"
@@ -3676,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}"
@@ -3813,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"
@@ -3888,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 ""
@@ -3918,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3945,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''"
@@ -4011,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 ""
@@ -4131,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"
@@ -4360,6 +4400,18 @@ 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 ""
@@ -4464,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 ""
@@ -4764,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"
@@ -4801,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"
@@ -4853,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 ""
@@ -5110,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 ""
@@ -5638,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5721,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 ""
@@ -5811,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 ""
@@ -5982,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 ""
@@ -6269,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"
@@ -6335,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"
@@ -6377,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)"
@@ -6537,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"
@@ -6855,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 ""
@@ -6986,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 ""
@@ -7010,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 ""
@@ -7123,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."
@@ -7222,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7309,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"
@@ -7328,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 ""
@@ -7394,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"
@@ -7470,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 ""
@@ -7485,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"
@@ -7701,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 "
@@ -7715,13 +7795,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7730,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 ""
@@ -7737,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 ..."
@@ -7850,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] ""
@@ -7862,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>"
@@ -7878,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:"
@@ -8024,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8054,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"
@@ -8407,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8428,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 ""
@@ -8485,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8551,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 ""
@@ -8734,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}''..."
@@ -8756,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"
@@ -8766,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:"
@@ -8987,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}''"
@@ -9702,6 +9811,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9770,6 +9912,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9823,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 ""
@@ -10279,6 +10429,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 ""
@@ -10342,7 +10498,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 ""
@@ -10600,40 +10756,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}''"
@@ -10686,8 +10842,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:"
@@ -10696,20 +10852,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 ""
@@ -10791,14 +10952,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,7 +11026,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10950,9 +11105,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10971,6 +11123,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 ""
@@ -11000,9 +11160,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 ""
@@ -11033,7 +11233,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 ""
@@ -11073,28 +11273,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..."
@@ -11189,6 +11387,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11204,12 +11405,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}."
@@ -11288,7 +11497,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11387,35 +11596,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 ""
@@ -11425,8 +11610,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 ..."
@@ -11453,10 +11638,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>"
@@ -11540,8 +11722,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}."
@@ -11738,7 +11920,7 @@ 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}"
@@ -11784,6 +11966,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."
@@ -11814,19 +12005,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 ""
@@ -11848,11 +12039,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 ""
@@ -11922,13 +12125,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}''"
@@ -12071,10 +12274,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"
@@ -12089,22 +12292,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}''"
@@ -12173,8 +12375,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..."
@@ -12189,9 +12390,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}''"
@@ -12513,12 +12729,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12529,30 +12744,73 @@ 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 "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] ""
+
+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"
@@ -12563,9 +12821,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."
@@ -12888,6 +13160,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 ""
@@ -13127,6 +13404,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."
@@ -13176,9 +13456,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 ""
@@ -13215,6 +13492,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 ""
@@ -13345,6 +13627,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13435,6 +13720,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 ""
@@ -13453,10 +13782,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 +13797,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13495,18 +13827,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 ""
@@ -13516,9 +13842,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13528,13 +13851,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13582,6 +13905,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13666,6 +13992,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13770,21 +14099,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 ""
@@ -13800,10 +14138,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"
@@ -13839,7 +14177,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13908,12 +14246,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 ""
@@ -13929,15 +14273,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 ""
@@ -13959,6 +14294,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13968,6 +14312,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13977,10 +14324,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14013,9 +14357,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14058,6 +14399,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14073,6 +14420,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14142,19 +14492,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14185,6 +14529,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14194,10 +14539,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14251,12 +14596,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14317,12 +14656,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14362,9 +14710,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14398,6 +14743,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 ""
@@ -14479,18 +14839,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 ""
@@ -14566,7 +14931,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14590,10 +14955,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"
@@ -14605,9 +14973,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14659,6 +15024,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14671,6 +15039,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14782,11 +15185,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14798,11 +15199,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14821,10 +15220,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14854,9 +15253,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14878,10 +15274,29 @@ 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"
@@ -15031,6 +15446,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15052,6 +15470,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15079,6 +15503,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15103,22 +15533,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 ""
@@ -15140,9 +15554,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15337,6 +15748,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15367,6 +15781,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15379,9 +15796,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15391,9 +15805,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15406,6 +15825,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15430,14 +15852,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15486,7 +15900,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15540,41 +15954,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"
@@ -15766,9 +16180,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15790,9 +16201,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15805,6 +16222,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15844,6 +16264,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15865,22 +16288,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"
@@ -16010,49 +16445,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"
@@ -16070,6 +16499,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16082,6 +16517,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16100,37 +16538,137 @@ 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"
@@ -16220,6 +16758,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 ""
@@ -16301,128 +16845,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16453,16 +17075,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16496,6 +17124,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16533,117 +17164,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 ""
@@ -16677,33 +17344,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 ""
@@ -16737,6 +17414,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 ""
@@ -16837,36 +17530,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 ""
@@ -16909,19 +17620,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 ""
@@ -17060,6 +17767,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 ""
@@ -17072,60 +17791,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 ""
@@ -17350,41 +18143,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"
@@ -17393,7 +18212,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17405,12 +18224,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 ""
@@ -17462,88 +18371,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17555,6 +18567,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 ""
@@ -17570,6 +18597,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17588,11 +18618,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17701,10 +18729,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17716,7 +18744,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17737,6 +18765,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17749,9 +18780,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17821,7 +18849,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17842,13 +18870,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"
@@ -17857,7 +18885,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17885,6 +18912,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17921,10 +18954,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"
@@ -17954,7 +19008,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17966,19 +19020,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"
@@ -18014,7 +19068,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18227,6 +19281,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18266,24 +19326,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 ""
@@ -18293,15 +19362,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18377,6 +19437,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18431,7 +19497,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18443,6 +19509,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18479,43 +19548,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18554,6 +19650,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18722,21 +19830,50 @@ 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 ""
+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 ""
@@ -18782,19 +19919,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"
@@ -18818,7 +19958,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18914,18 +20054,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 ""
@@ -18935,7 +20084,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18944,10 +20096,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18965,6 +20117,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18980,28 +20135,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"
@@ -19022,19 +20177,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"
@@ -19109,10 +20264,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19127,9 +20285,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19157,6 +20312,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19202,10 +20360,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"
@@ -19217,7 +20405,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"
@@ -19235,7 +20423,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19352,19 +20540,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 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"
@@ -19383,7 +20682,46 @@ 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 "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 "Landsat"
@@ -19395,19 +20733,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 "skobbler heatmap"
@@ -19428,7 +20775,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19437,6 +20784,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19583,6 +20933,29 @@ 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 ""
@@ -19748,6 +21121,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19793,6 +21169,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19979,19 +21388,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20015,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}''."
@@ -20284,10 +21699,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20491,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"
@@ -20762,15 +22180,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20941,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 ""
@@ -20959,12 +22371,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21100,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 ""
@@ -21117,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 ""
@@ -21343,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."
@@ -21393,7 +22808,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21578,6 +22993,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21617,27 +23097,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 ""
@@ -22715,9 +24177,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 ""
@@ -23364,9 +24843,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23419,18 +24895,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 ""
@@ -23777,6 +25241,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23928,6 +25413,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 ""
@@ -24245,9 +25733,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24463,6 +25948,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 ""
@@ -24495,15 +25983,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 ""
@@ -24618,9 +26122,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24799,19 +26300,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"
@@ -25027,6 +26528,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 ""
@@ -25063,6 +26653,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..."
@@ -25215,9 +26808,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26203,9 +27793,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26484,9 +28071,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 8e0fa02..324d16d 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-08-04 03:41+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-08-05 04:57+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -63,6 +66,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -167,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 ""
@@ -263,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"
@@ -302,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}"
@@ -358,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 ""
@@ -541,6 +544,9 @@ msgstr "Istoric"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -654,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 ""
@@ -804,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"
@@ -992,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 ""
@@ -1015,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>"
@@ -1183,9 +1182,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1324,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"
@@ -1419,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ă"
@@ -1703,6 +1720,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1922,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] ""
@@ -2348,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 ""
@@ -2544,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 ""
@@ -2631,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 ""
@@ -2667,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"
@@ -2694,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}''"
@@ -2800,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] ""
@@ -2860,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"
@@ -2891,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"
@@ -2915,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 ""
@@ -2945,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 ""
@@ -2965,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 ""
@@ -2974,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 ""
@@ -2994,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}"
@@ -3025,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}''."
@@ -3184,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 ""
@@ -3292,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 ""
@@ -3330,9 +3357,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3371,6 +3395,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3395,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 ""
@@ -3454,6 +3490,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3536,6 +3575,15 @@ 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 ""
@@ -3605,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 ""
@@ -3662,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})"
@@ -3700,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}"
@@ -3837,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"
@@ -3912,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 ""
@@ -3942,9 +3999,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3969,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''"
@@ -4035,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 ""
@@ -4155,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"
@@ -4384,6 +4421,18 @@ 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 ""
@@ -4488,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 ""
@@ -4788,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 "> 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"
@@ -4825,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"
@@ -4877,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 ""
@@ -5134,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 ""
@@ -5666,6 +5712,9 @@ msgstr "Arată/Ascunde"
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5749,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 ""
@@ -5839,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 ""
@@ -6010,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 ""
@@ -6297,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"
@@ -6363,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"
@@ -6405,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)"
@@ -6565,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"
@@ -6883,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"
@@ -7014,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, "
@@ -7038,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 ""
@@ -7151,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."
@@ -7250,6 +7326,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7337,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"
@@ -7356,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 ""
@@ -7422,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"
@@ -7498,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 ""
@@ -7513,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"
@@ -7729,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 "
@@ -7743,10 +7820,26 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 ""
+
+msgid "Cancel and return to the previous dialog"
msgstr ""
msgid "Do not show this message again"
@@ -7758,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 ""
@@ -7765,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 ""
@@ -7880,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] ""
@@ -7892,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>"
@@ -7908,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:"
@@ -8054,7 +8160,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8084,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"
@@ -8439,9 +8545,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8460,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"
@@ -8517,6 +8623,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8583,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 ""
@@ -8766,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}''..."
@@ -8788,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"
@@ -8798,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:"
@@ -9019,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}''"
@@ -9734,6 +9838,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9804,6 +9941,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9857,6 +9997,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 ""
@@ -10315,6 +10460,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 ""
@@ -10378,7 +10529,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 ""
@@ -10636,40 +10787,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}''"
@@ -10722,8 +10873,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:"
@@ -10732,20 +10883,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 ""
@@ -10827,14 +10983,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"
@@ -10908,6 +11058,9 @@ msgstr ""
msgid "New relation"
msgstr ""
+msgid "Change Tags"
+msgstr ""
+
msgid "Change Properties"
msgstr "Modificare proprietăţi"
@@ -10987,9 +11140,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr "Eroare la prelucrarea {0}: "
@@ -11008,6 +11158,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 ""
@@ -11037,9 +11195,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 ""
@@ -11070,7 +11268,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 ""
@@ -11110,28 +11308,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..."
@@ -11226,6 +11422,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11241,12 +11440,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}."
@@ -11325,7 +11532,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11424,35 +11631,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 ""
@@ -11462,8 +11645,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 ..."
@@ -11490,10 +11673,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>"
@@ -11577,8 +11757,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}."
@@ -11775,7 +11955,7 @@ 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}"
@@ -11821,6 +12001,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."
@@ -11851,19 +12040,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 ""
@@ -11885,11 +12074,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 ""
@@ -11959,13 +12160,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}''"
@@ -12108,10 +12309,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"
@@ -12126,22 +12327,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}''"
@@ -12210,8 +12410,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..."
@@ -12226,9 +12425,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}''"
@@ -12550,12 +12764,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12566,27 +12779,70 @@ 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 "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] ""
+
+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"
@@ -12600,9 +12856,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."
@@ -12925,6 +13195,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 ""
@@ -13164,6 +13439,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."
@@ -13213,9 +13491,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 ""
@@ -13252,6 +13527,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 ""
@@ -13382,6 +13662,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13472,6 +13755,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 ""
@@ -13490,10 +13817,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13505,6 +13832,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13532,18 +13862,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 ""
@@ -13553,9 +13877,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13565,13 +13886,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13619,6 +13940,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13703,6 +14027,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13807,21 +14134,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 ""
@@ -13837,10 +14173,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"
@@ -13876,7 +14212,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13945,12 +14281,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 ""
@@ -13966,15 +14308,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 ""
@@ -13996,6 +14329,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -14005,6 +14347,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -14014,10 +14359,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14050,9 +14392,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14095,6 +14434,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14110,6 +14455,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14179,19 +14527,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14222,6 +14564,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14231,10 +14574,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14288,12 +14631,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14354,12 +14691,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14399,9 +14745,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14435,6 +14778,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 ""
@@ -14516,18 +14874,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 ""
@@ -14603,7 +14966,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14627,10 +14990,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"
@@ -14642,9 +15008,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14696,6 +15059,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14708,6 +15074,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14819,11 +15220,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14835,11 +15234,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14858,10 +15255,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14891,9 +15288,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14915,10 +15309,29 @@ 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"
@@ -15068,6 +15481,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15089,7 +15505,13 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
-msgid "Tyres"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
+msgid "Tyres"
msgstr ""
msgid "Edit Tyres"
@@ -15116,6 +15538,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15140,22 +15568,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 ""
@@ -15177,9 +15589,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15374,6 +15783,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15404,6 +15816,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15416,9 +15831,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15428,9 +15840,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15443,6 +15860,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15467,14 +15887,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15523,7 +15935,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15577,41 +15989,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"
@@ -15803,9 +16215,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15827,9 +16236,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15842,6 +16257,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15881,6 +16299,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15902,22 +16323,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"
@@ -16047,49 +16480,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"
@@ -16107,6 +16534,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16119,6 +16552,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16137,37 +16573,137 @@ 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"
@@ -16257,6 +16793,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 ""
@@ -16338,125 +16880,203 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
msgstr ""
msgid "Edit Shelter"
@@ -16490,16 +17110,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16533,6 +17159,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16570,117 +17199,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 ""
@@ -16714,33 +17379,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 ""
@@ -16774,6 +17449,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 ""
@@ -16874,36 +17565,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 ""
@@ -16946,19 +17655,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 ""
@@ -17097,6 +17802,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 ""
@@ -17109,60 +17826,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 ""
@@ -17387,41 +18178,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"
@@ -17430,7 +18247,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17442,12 +18259,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 ""
@@ -17499,88 +18406,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17592,6 +18602,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 ""
@@ -17607,6 +18632,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17625,11 +18653,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17738,10 +18764,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17753,7 +18779,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17774,6 +18800,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17786,9 +18815,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17858,7 +18884,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17879,13 +18905,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"
@@ -17894,7 +18920,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17922,6 +18947,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17958,10 +18989,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"
@@ -17991,7 +19043,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18003,19 +19055,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"
@@ -18051,7 +19103,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18264,6 +19316,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18303,24 +19361,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 ""
@@ -18330,15 +19397,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18414,6 +19472,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18468,7 +19532,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18480,6 +19544,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18516,43 +19583,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18591,6 +19685,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18759,21 +19865,50 @@ 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 ""
+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 ""
@@ -18819,19 +19954,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"
@@ -18855,7 +19993,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18951,18 +20089,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 ""
@@ -18972,7 +20119,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18981,10 +20131,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -19002,6 +20152,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19017,28 +20170,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"
@@ -19059,19 +20212,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"
@@ -19146,10 +20299,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19164,9 +20320,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19194,6 +20347,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19239,10 +20395,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"
@@ -19254,7 +20440,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"
@@ -19272,7 +20458,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19389,19 +20575,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 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"
@@ -19420,7 +20717,46 @@ 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 "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 "Landsat"
@@ -19432,19 +20768,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 "skobbler heatmap"
@@ -19465,7 +20810,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19474,6 +20819,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19620,6 +20968,29 @@ 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 ""
@@ -19785,6 +21156,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19830,6 +21204,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -20016,19 +21423,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20052,13 +21471,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20321,10 +21734,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20528,7 +21944,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"
@@ -20799,15 +22215,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20978,6 +22385,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 ""
@@ -20996,12 +22406,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21137,6 +22541,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 ""
@@ -21154,6 +22561,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 ""
@@ -21380,7 +22790,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."
@@ -21430,7 +22843,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21615,6 +23028,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21654,27 +23132,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 ""
@@ -22752,9 +24212,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 ""
@@ -23401,9 +24878,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23456,18 +24930,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 ""
@@ -23814,6 +25276,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23965,6 +25448,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 ""
@@ -24282,9 +25768,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24500,6 +25983,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 ""
@@ -24532,15 +26018,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 ""
@@ -24655,9 +26157,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24836,19 +26335,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"
@@ -25064,6 +26563,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 ""
@@ -25100,6 +26688,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..."
@@ -25252,9 +26843,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26240,9 +27828,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26521,9 +28106,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 400b885..a8d6626 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-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-08-15 09:27+0000\n"
-"Last-Translator: Nkolay Parukhin <parukhin at gmail.com>\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-08-16 04:32+0000\n"
-"X-Generator: Launchpad (build 16723)\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,9 @@ msgstr "Условия использования подложки"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "Переход по ссылке не поддерживается на данной платформе (''{0}'')"
+msgid "ERROR: {0}"
+msgstr "ОШИБКА: {0}"
+
msgid "WARNING: {0}"
msgstr "ПРЕДУПРЕЖДЕНИЕ: {0}"
@@ -72,6 +75,9 @@ msgstr "ИНФОРМАЦИЯ: {0}"
msgid "DEBUG: {0}"
msgstr "ОТЛАДКА: {0}"
+msgid "Cause: "
+msgstr "Причина: "
+
msgid "Executing platform startup hook"
msgstr "Исполнение стартовых процедур"
@@ -177,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 "
@@ -281,9 +286,6 @@ msgstr "Инструмент: {0}"
msgid "Please select at least four nodes."
msgstr "Выделите не менее четырёх точек."
-msgid "Information"
-msgstr "Информация"
-
msgid "Align Nodes in Line"
msgstr "Выстроить точки в линию"
@@ -321,6 +323,9 @@ msgstr "следующего"
msgid "Nothing selected to zoom to."
msgstr "Ничего не выделено для масштабирования."
+msgid "Information"
+msgstr "Информация"
+
msgid "Zoom to {0}"
msgstr "Масштабировать до {0}"
@@ -377,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} линии"
@@ -568,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)"
@@ -690,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 "Уладить конфликты тегов"
@@ -865,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 "Прервать объединение"
@@ -1049,6 +1056,8 @@ msgid ""
"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 "
@@ -1080,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 "
@@ -1110,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>"
@@ -1293,9 +1294,6 @@ msgstr "Загрузить сеанс"
msgid "Load a session from file."
msgstr "Загрузить сеанс из файла."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Файл сеанса (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Открыть сеанс"
@@ -1450,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} части"
@@ -1564,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 "Отмена"
@@ -1806,13 +1826,13 @@ msgid "Markers from {0}"
msgstr "Маркеры из {0}"
msgid "Download Compressed OSM Change"
-msgstr ""
+msgstr "Скачать сжатые OSM изменения"
msgid "Download OSM Change"
-msgstr ""
+msgstr "Скачать изменения данных OSM"
msgid "Download Compressed OSM"
-msgstr ""
+msgstr "Скачать сжатые OSM данные"
msgid "Download OSM"
msgstr "Скачать OSM"
@@ -1837,7 +1857,7 @@ msgid "Request details: {0}"
msgstr "Параметры запроса: {0}"
msgid "Download OSM URL"
-msgstr ""
+msgstr "Скачать данные OSM (URL)"
msgid "There was {0} conflict during import."
msgid_plural "There were {0} conflicts during import."
@@ -1860,6 +1880,9 @@ 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} осталось)"
@@ -2111,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} линиям"
@@ -2590,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 "комбинаторы"
@@ -2800,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 "
@@ -2901,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}"
@@ -2937,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}\" для"
@@ -2966,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}''"
@@ -3097,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} точку"
@@ -3170,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 "Отношение"
@@ -3203,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 "Роли в отношениях, относящихся к"
@@ -3228,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}"
@@ -3261,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 "
@@ -3285,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 "
@@ -3298,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 "
@@ -3326,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}"
@@ -3359,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}''"
@@ -3533,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."
@@ -3645,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)"
@@ -3686,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"
@@ -3729,6 +3756,9 @@ msgstr "другое при проверке"
msgid "Running test {0}"
msgstr "Запуск теста {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr "Тест ''{0}'' завершен за {1}"
+
msgid "Addresses"
msgstr "Адреса"
@@ -3753,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 "Здание внутри другого здания"
@@ -3815,6 +3854,9 @@ msgstr " или "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0} устарел, используйте вместо него {1}"
+msgid "{0} is unnecessary"
+msgstr "{0} не требуется"
+
msgid "Duplicated nodes"
msgstr "Дублированные точки"
@@ -3901,6 +3943,15 @@ 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 "Мультиполигон"
@@ -3975,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 "Перекрывающиеся полигоны"
@@ -4033,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})"
@@ -4073,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}"
@@ -4219,8 +4276,8 @@ msgstr ""
"Использовать установленный по умолчанию файл проверки правописания "
"(рекомендуется)"
-msgid "Fix properties"
-msgstr "Исправить параметры"
+msgid "Fix tags"
+msgstr "Исправить теги"
msgid "Could not find element type"
msgstr "Не удалось найти тип элемента"
@@ -4296,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}"
@@ -4326,9 +4386,6 @@ msgstr "здание"
msgid "area"
msgstr "полигон"
-msgid "Unclosed way"
-msgstr "Незамкнутая линия"
-
msgid "Unconnected ways"
msgstr "Несоединённые линии"
@@ -4355,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''"
@@ -4423,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 "Не показывать снова (запомнить выбор)"
@@ -4548,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 "Сообщение дня недоступно"
@@ -4798,6 +4835,18 @@ 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 "Аудио"
@@ -4904,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} мс)"
@@ -5230,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."
@@ -5237,6 +5276,9 @@ msgstr ""
"Скопировать выделенные элементы перед первым выделенным элементом в списке "
"объединённых элементов"
+msgid "> after"
+msgstr "> после"
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -5244,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."
@@ -5261,6 +5312,9 @@ msgstr ""
"Скопировать их выделенные элементы перед первым выделенным элементом в "
"списке объединённых элементов"
+msgid "< after"
+msgstr "< после"
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -5277,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 "Вниз"
@@ -5336,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 "Точка"
@@ -5624,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>"
@@ -5632,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>"
@@ -6216,6 +6260,9 @@ msgstr "Показать/скрыть"
msgid "Information about layer"
msgstr "Информация о слое"
+msgid "Map paint preferences"
+msgstr "Настройки отрисовки карты"
+
msgid "Map Paint Styles"
msgstr "Стили отрисовки карты"
@@ -6300,6 +6347,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 ""
+"Идентификаторы объектов могут быть разделены запятыми или пробелами.<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 "Отношения"
@@ -6393,10 +6472,9 @@ 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 ""
@@ -6572,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 "Загрузить и показать историю выбранных объектов"
@@ -6907,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 ""
@@ -6980,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 "Изменить отношение"
@@ -7022,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)"
@@ -7196,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"
@@ -7556,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 "Закладки"
@@ -7708,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, "
@@ -7734,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 "Тип класса"
@@ -7869,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 "Не удалось открыть справочную страницу. Ссылка пуста."
@@ -7978,6 +8053,9 @@ msgid ""
msgstr ""
"<html>Версия <strong>{0}</strong> Создано на <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr "Комментарий к пакету правок"
+
msgid "Changeset info"
msgstr "Информация о пакете правок"
@@ -8089,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 "Передать на сервер"
@@ -8114,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 пакета правок:"
@@ -8185,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"
@@ -8274,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 "
@@ -8294,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 "Загрузить объекты"
@@ -8564,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 "
@@ -8584,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 ""
"Вернуться в предыдущий диалог, чтобы добавить более развёрнутый комментарий"
@@ -8600,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 "Отменить передачу на сервер и продолжить редактирование"
@@ -8607,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 "Подготовка объектов для передачи..."
@@ -8762,9 +8877,6 @@ msgstr ""
"Объект ''{0}'' уже удалён. Объект будет пропущен при передаче данных на "
"сервер."
-msgid "Warning: {0}"
-msgstr "Предупреждение: {0}"
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Передача на сервер {0} объекта..."
@@ -8777,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>"
@@ -8797,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 "Пожалуйста, выберите стратегию передачи на сервер:"
@@ -8960,7 +9074,7 @@ msgstr "Следующий маркер"
msgid "Jump to next marker"
msgstr "К следующему маркеру"
-msgid "Previos marker"
+msgid "Previous marker"
msgstr "Предыдущий маркер"
msgid "Jump to previous marker"
@@ -8993,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"
@@ -9378,9 +9490,6 @@ msgstr "Извлечение GPS координат из EXIF"
msgid "Starting directory scan"
msgstr "Запуск сканирования каталога"
-msgid "One of the selected files was null"
-msgstr "Один из выделенных файлов пуст"
-
msgid "Read photos..."
msgstr "Прочитать фотографии..."
@@ -9399,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 "Изображения с данными о местоположении"
@@ -9460,6 +9572,12 @@ msgstr "Следующее"
msgid "Show next Image"
msgstr "Показать следующее изображение"
+msgid "Show first Image"
+msgstr "Показать первое изображение"
+
+msgid "Show last Image"
+msgstr "Показать последнее изображение"
+
msgid "Center view"
msgstr "Центрировать вид"
@@ -9543,9 +9661,6 @@ msgstr ""
"считается вредоносной.<br>Если хотите загрузить треки, ознакомьтесь с "
"этим:</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr "Настроить отрисовку трека"
@@ -9747,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}''..."
@@ -9778,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 ""
@@ -9792,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 "Ключ маркера доступа:"
@@ -10063,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}''"
@@ -10137,10 +10243,10 @@ msgid "Select to grant JOSM the right to write your server preferences"
msgstr "Выберите, чтобы позволить JOSM записывать ваши настройки сервера"
msgid "Allow modifications of notes"
-msgstr ""
+msgstr "Разрешить изменение примечаний"
msgid "Select to grant JOSM the right to modify notes on your behalf"
-msgstr ""
+msgstr "Выберите, чтобы разрешить JOSM изменять примечания от вашего имени"
msgid "Retrieving OAuth Access Token..."
msgstr "Получение маркера доступа OAuth..."
@@ -10864,6 +10970,41 @@ 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 "Изменить параметры строки"
+
+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: NonDefalut"
msgstr "Расширенные настройки: Не по умолчанию"
@@ -10934,6 +11075,9 @@ msgstr "Отображать виртуальные точки в режиме
msgid "Draw inactive layers in other color"
msgstr "Отображать неактивные слои другим цветом"
+msgid "Display discardable keys"
+msgstr "Показывать удаляемые ключи"
+
msgid "Highlight target ways and nodes"
msgstr "Выделите целевые линии и точки"
@@ -10992,6 +11136,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 "Настройки, влияющие на скорость отображения"
@@ -11480,6 +11631,12 @@ msgstr ""
"При этом к имени файла добавляется суффикс ''~'' и он сохраняется в той же "
"папке.)</i>"
+msgid "Notification at each save"
+msgstr "Уведомление при каждом сохранении"
+
+msgid "When saving, display a small notification"
+msgstr "При сохранении показывать маленькое уведомление"
+
msgid "File backup"
msgstr "Резервное копирование"
@@ -11547,8 +11704,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"
@@ -11830,21 +11987,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"
@@ -11866,6 +12008,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}''"
@@ -11924,35 +12081,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. "
@@ -12044,19 +12198,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 "Горячие клавиши: пользовательское"
@@ -12130,8 +12276,8 @@ msgstr "Применить заготовку"
msgid "New relation"
msgstr "Новое отношение"
-msgid "Change Properties"
-msgstr "Изменить параметры"
+msgid "Change Tags"
+msgstr "Изменить теги"
msgid "Unknown requisite: {0}"
msgstr "Неизвестный запрос: {0}"
@@ -12219,9 +12365,6 @@ msgstr "Заготовка элемента роли без родителей"
msgid "Preset sub element without parent"
msgstr "Заготовка вложенного элемента без родителей"
-msgid "Could not read tagging preset source: {0}"
-msgstr "Не удалось прочитать источник заготовок тегов: {0}"
-
msgid "Error parsing {0}: "
msgstr "Ошибка при разборе {0}: "
@@ -12240,6 +12383,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 "Все файлы (*.*)"
@@ -12275,9 +12428,58 @@ 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 "unset: не устанавливать этот параметр у выделенных объектов"
+
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 ""
@@ -12313,11 +12515,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}''."
@@ -12361,40 +12563,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 "Разбор ответа сервера..."
@@ -12496,6 +12694,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}."
@@ -12511,15 +12712,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}."
@@ -12606,8 +12816,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!"
@@ -12714,48 +12924,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 "
@@ -12765,11 +12942,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 "Разбор содержимого пакета правок ..."
@@ -12798,12 +12975,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>"
@@ -12896,11 +13069,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}."
@@ -13110,10 +13283,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 "RemoteControl::Accepting connections on port {0}"
msgstr "Удалённое управление::Приём подключений на порт {0}"
@@ -13160,6 +13338,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."
@@ -13195,20 +13382,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: "
@@ -13231,12 +13418,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}''."
@@ -13312,18 +13511,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}''"
@@ -13499,12 +13698,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 "Отключить модуль"
@@ -13518,29 +13716,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}''"
@@ -13614,11 +13811,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 "Обработка файлов пиктограмм из кэша сайта модулей..."
@@ -13632,12 +13827,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}''"
@@ -14122,16 +14332,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 "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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
-"Предупреждение: Ошибка доступа к каталогу ''{0}'' по причине защиты. Текст "
-"ошибки: {1}"
+"Нет доступа к каталогу ''{0}'' по соображениям безопасности. Ошибка: {1}"
msgid "{0}... [please type its number]"
msgstr "{0}... [пожалуйста, введите его номер]"
@@ -14143,9 +14350,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}'' на "
@@ -14182,8 +14436,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 "
@@ -14529,6 +14798,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 ""
@@ -14833,6 +15109,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."
@@ -14894,9 +15173,6 @@ msgstr ""
"может быть ограничено указанием максимального размера удаляемого фрагмента. "
"Также удаляет близкорасположенные точки."
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr "Создание и правка карт морей для OpenSeaMap"
-
msgid "Edit features for OpenSeaMap"
msgstr "Изменений свойств редактирования OpenSeaMap"
@@ -14943,6 +15219,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"
@@ -15085,6 +15368,9 @@ msgstr "Насыпь"
msgid "Lit"
msgstr "Освещённая"
+msgid "Toll"
+msgstr "Платная"
+
msgid "Motorway Link"
msgstr "Съезд с автомагистрали"
@@ -15175,6 +15461,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 "Жилая улица"
@@ -15193,10 +15523,10 @@ msgstr "Полигон"
msgid "Service"
msgstr "Служебная"
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr "Свойства служебного проезда"
-msgid "Serviceway type"
+msgid "Service way type"
msgstr "Тип служебного проезда"
msgid "alley"
@@ -15208,6 +15538,9 @@ msgstr "подъездная дорожка"
msgid "parking_aisle"
msgstr "парковочный проезд"
+msgid "drive-through"
+msgstr "обслуживание в авто"
+
msgid "Parking Aisle"
msgstr "Проезд на парковке"
@@ -15235,18 +15568,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 "Тупик"
@@ -15256,9 +15583,6 @@ msgstr "Ограничения режима передвижения"
msgid "General Access"
msgstr "Доступ для всех"
-msgid "destination"
-msgstr "резиденты"
-
msgid "delivery"
msgstr "доставка"
@@ -15268,15 +15592,15 @@ msgstr "разрешено владельцем"
msgid "private"
msgstr "по пропускам"
+msgid "customers"
+msgstr "клиенты"
+
msgid "agricultural"
msgstr "сельскохозяйственное"
msgid "forestry"
msgstr "лесничество"
-msgid "no"
-msgstr "нет"
-
msgid "official"
msgstr "официальное"
@@ -15322,6 +15646,9 @@ msgstr "ТС с пассажирами (hov)"
msgid "Public Service Vehicles (psv)"
msgstr "Общественный транспорт"
+msgid "Tourist buses"
+msgstr "Туристические автобусы"
+
msgid "Min. speed (km/h)"
msgstr "Мин. скорость (в км/ч)"
@@ -15406,8 +15733,11 @@ msgstr "Свойства моста"
msgid "viaduct"
msgstr "виадук"
+msgid "suspension"
+msgstr "подвесной"
+
msgid "swing"
-msgstr "перепад"
+msgstr "поворотный мост"
msgid "aqueduct"
msgstr "акведук"
@@ -15523,20 +15853,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 "Инвалидные коляски"
@@ -15553,11 +15892,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 "Велодорожка"
@@ -15592,8 +15931,8 @@ msgstr "Велодорожка справа"
msgid "Oneway (bicycle)"
msgstr "одностороннее движение (велосипедов)"
-msgid "Edit Highway"
-msgstr "Свойства дороги"
+msgid "Edit Highway Attributes:"
+msgstr "Свойства дороги:"
msgid "Highway"
msgstr "Дорога"
@@ -15661,12 +16000,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 "Тип пешеходного перехода"
@@ -15682,15 +16027,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 "Название перехода (Великобритания)"
@@ -15712,6 +16048,15 @@ msgstr "pegasus (для верховой езды)"
msgid "tiger"
msgstr "tiger (нерегулируемый вело-пешеходный)"
+msgid "Crossing attendant"
+msgstr "Под наблюдением постового"
+
+msgid "Cross by bicycle"
+msgstr "Разрешён переезд на велосипеде"
+
+msgid "Cross on horseback"
+msgstr "Разрешён переезд на лошади"
+
msgid "Stop"
msgstr "Стоп"
@@ -15721,6 +16066,9 @@ msgstr "Уступите дорогу"
msgid "Mini-roundabout"
msgstr "Мини-круг"
+msgid "Edit Mini-Roundabout"
+msgstr "Свойства мини-круга"
+
msgid "Direction"
msgstr "Направление"
@@ -15730,11 +16078,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 "Приспособление для ограничения скорости"
@@ -15766,9 +16111,6 @@ msgstr "стол"
msgid "Passing Place"
msgstr "Место разъезда"
-msgid "Edit Passing Place"
-msgstr "Свойства места разъезда"
-
msgid "Turning Circle"
msgstr "Разворотный круг"
@@ -15811,6 +16153,12 @@ msgstr "Свойства бетонного блока"
msgid "Allowed traffic:"
msgstr "Разрешено движение:"
+msgid "Material"
+msgstr "Материал"
+
+msgid "stone"
+msgstr "камень"
+
msgid "Bollard"
msgstr "Столбик"
@@ -15826,6 +16174,9 @@ msgstr "поднимающийся"
msgid "removable"
msgstr "удаляемый"
+msgid "plastic"
+msgstr "пластик"
+
msgid "Cycle Barrier"
msgstr "Преграда для велосипедов"
@@ -15895,20 +16246,17 @@ msgstr "сетка Рабица"
msgid "electric"
msgstr "электричество"
-msgid "roundpole"
-msgstr "изгородь"
-
-msgid "split_rail"
-msgstr "штакетник"
+msgid "pole"
+msgstr "столб"
-msgid "chain"
-msgstr "сетка Рабица"
+msgid "Guard Rail"
+msgstr "Дорожное ограждение"
-msgid "hedge"
-msgstr "живая изгородь"
+msgid "Edit Guard Rail"
+msgstr "Свойства дорожного ограждения"
-msgid "pole"
-msgstr "столб"
+msgid "wire"
+msgstr "проволока"
msgid "Guard Rail"
msgstr "Дорожное ограждение"
@@ -15938,6 +16286,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr "Канава"
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr "Свойства канавы"
@@ -15947,11 +16296,11 @@ msgstr "Бордюр"
msgid "Edit Kerb"
msgstr "Свойства бордюра"
-msgid "Entrance"
-msgstr "проход"
+msgid "Entrance (barrier opening)"
+msgstr "Проход или проезд (проём в преграде)"
-msgid "Edit Entrance"
-msgstr "Свойства прохода"
+msgid "Edit Entrance (barrier opening)"
+msgstr "Свойства прохода или проезда (проёма в преграде)"
msgid "Gate"
msgstr "ворота / дверь"
@@ -16004,12 +16353,6 @@ msgstr "узкий проход"
msgid "stepover"
msgstr "перелаз"
-msgid "Material"
-msgstr "Материал"
-
-msgid "stone"
-msgstr "камень"
-
msgid "Turnstile"
msgstr "Турникет"
@@ -16070,12 +16413,21 @@ msgstr "Свойства дренажного канала"
msgid "Ditch"
msgstr "Канава"
+msgid "Edit Ditch"
+msgstr "Свойства канавы"
+
msgid "Stream"
msgstr "Ручей"
msgid "Edit Stream"
msgstr "Свойства ручья"
+msgid "Wadi"
+msgstr "Сухое русло"
+
+msgid "Edit Wadi"
+msgstr "Свойства сухого русла"
+
msgid "Canal"
msgstr "Канал"
@@ -16115,9 +16467,6 @@ msgstr "Свойства дамбы"
msgid "Groyne"
msgstr "Буна"
-msgid "Edit Groyne"
-msgstr "Свойства буны"
-
msgid "Breakwater"
msgstr "Волнорез"
@@ -16151,6 +16500,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 "Суша"
@@ -16232,18 +16596,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 "пассажиры;транспорт"
@@ -16319,8 +16688,8 @@ msgstr "туристический"
msgid "freight"
msgstr "грузовой"
-msgid "Service/Type"
-msgstr "Служебная/тип"
+msgid "Service type"
+msgstr "Тип служебного пути"
msgid "yard"
msgstr "депо"
@@ -16343,11 +16712,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"
@@ -16358,9 +16730,6 @@ msgstr "Узкоколейка"
msgid "Edit Narrow Gauge Rail"
msgstr "Свойства узкоколейки"
-msgid "Types"
-msgstr "Типы"
-
msgid "Monorail"
msgstr "Монорельс"
@@ -16412,6 +16781,9 @@ msgstr "Свойства разобранных путей"
msgid "Level Crossing"
msgstr "Железнодорожный переезд"
+msgid "Edit Level Crossing"
+msgstr "Свойства железнодорожного переезда"
+
msgid "Supervised"
msgstr "Охраняемая"
@@ -16424,18 +16796,32 @@ msgstr "Звуковые сигналы"
msgid "Barrier"
msgstr "Ограждение"
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr "да"
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr "нет"
+
+msgctxt "crossing:barrier"
msgid "half"
-msgstr "половинная"
+msgstr "половинное"
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "полная"
+msgstr "полное"
+msgctxt "crossing:barrier"
msgid "double_half"
-msgstr "двустороннее половинное"
+msgstr "двойное половинное"
msgid "Crossing"
msgstr "Переход через рельсовые пути"
+msgid "Edit Crossing"
+msgstr "Свойства перехода"
+
msgid "Crossing type"
msgstr "Тип перехода"
@@ -16535,11 +16921,9 @@ msgstr "Ленточный подъёмник"
msgid "Edit Magic Carpet"
msgstr "Свойства ленточного подъёмника"
-msgctxt "aerialway"
msgid "Goods"
msgstr "Грузовая"
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr "Свойства грузовой канатной дороги"
@@ -16551,11 +16935,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Свойства станции"
-msgctxt "aerialway"
msgid "Pylon"
msgstr "Опора"
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr "Свойства опоры"
@@ -16574,12 +16956,12 @@ msgstr "наземная"
msgid "underground"
msgstr "подземная"
+msgid "rooftop"
+msgstr "крыша"
+
msgid "Access"
msgstr "Доступ"
-msgid "customers"
-msgstr "клиенты"
-
msgid "Park and Ride"
msgstr "Перехватывающая парковка"
@@ -16607,9 +16989,6 @@ msgstr "Парковочное место"
msgid "Edit Parking space"
msgstr "Свойства парковочного места"
-msgid "rooftop"
-msgstr "крыша"
-
msgid "Capacity"
msgstr "Вместимость"
@@ -16631,11 +17010,31 @@ 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 "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-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 "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 "Въезд на парковку"
@@ -16784,6 +17183,9 @@ msgstr "Станция зарядки"
msgid "Edit Charging Station (for electric cars)"
msgstr "Свойства станции зарядки электромобилей"
+msgid "Voltage"
+msgstr "Напряжение"
+
msgid "Amperage"
msgstr "Сила тока"
@@ -16805,6 +17207,12 @@ msgstr "Автомастерская"
msgid "Edit Car Repair"
msgstr "Свойства автомастерской"
+msgid "Parts"
+msgstr "Запчасти"
+
+msgid "Edit Car Parts"
+msgstr "Свойства магазина запчастей"
+
msgid "Tyres"
msgstr "Магазин автошин"
@@ -16832,6 +17240,12 @@ msgstr "Прокат"
msgid "Edit Car Rental"
msgstr "Свойства проката автомобилей"
+msgid "Second hand"
+msgstr "Подержанные"
+
+msgid "only"
+msgstr "только"
+
msgid "Sharing"
msgstr "Кратковременный прокат"
@@ -16856,22 +17270,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 "марка"
@@ -16893,9 +17291,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Запчасти"
-
msgid "Clothes"
msgstr "Одежда"
@@ -17092,6 +17487,9 @@ msgstr "Платформа"
msgid "Station or amenities"
msgstr "Станция или услуги"
+msgid "Edit Stop Position"
+msgstr "Свойства места остановки"
+
msgid "Bus"
msgstr "Автобус"
@@ -17122,6 +17520,9 @@ msgstr "Фуникулёр"
msgid "Ferry"
msgstr "Паром"
+msgid "Edit Platform"
+msgstr "Свойства платформы"
+
msgid "Bench"
msgstr "Скамейка"
@@ -17134,9 +17535,6 @@ msgstr "Инвалидное кресло"
msgid "limited"
msgstr "ограничено"
-msgid "only"
-msgstr "только"
-
msgid "Highway platform (legacy)"
msgstr "Остановка общественного транспорта (устар.)"
@@ -17146,9 +17544,14 @@ msgstr "Железнодорожная платформа (устаревший
msgid "funicular"
msgstr "фуникулёр"
+msgctxt "railway"
msgid "Station"
msgstr "Станция"
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Свойства станции"
+
msgid "Building"
msgstr "Здание"
@@ -17161,6 +17564,9 @@ msgstr "Свойства входа в метро"
msgid "Ticket Machine"
msgstr "Автомат для покупки билетов"
+msgid "Edit Ticket Machine"
+msgstr "Свойства автомата для покупки билетов"
+
msgid "Reference Number"
msgstr "Номер для обращения"
@@ -17185,14 +17591,6 @@ msgstr "накопительные, дисконтные карты"
msgid "Public Transport (legacy)"
msgstr "Общественный транспорт (устаревший формат)"
-msgctxt "railway"
-msgid "Station"
-msgstr "Станция"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Свойства станции"
-
msgid "UIC-Reference"
msgstr "код UIC"
@@ -17241,7 +17639,7 @@ msgstr "Свойства автобусной платформы"
msgid "Taxi"
msgstr "Такси"
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr "Свойства стоянки такси"
msgid "Airport"
@@ -17295,6 +17693,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 "Выход на посадку"
@@ -17317,21 +17730,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 "С местами для курения"
@@ -17521,9 +17919,6 @@ msgstr "Стриптиз-клуб"
msgid "Edit Stripclub"
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 "Tourism"
msgstr "Туризм"
@@ -17545,9 +17940,15 @@ msgstr "Наблюдательная вышка"
msgid "Information Office"
msgstr "Справочное бюро"
+msgid "Edit Information Office"
+msgstr "Свойства справочного бюро"
+
msgid "Map"
msgstr "Карта"
+msgid "Edit Information Map"
+msgstr "Свойства информационной карты"
+
msgid "Detail Grade"
msgstr "Тип карты"
@@ -17560,6 +17961,9 @@ msgstr "карта улиц"
msgid "scheme"
msgstr "план-схема"
+msgid "toposcope"
+msgstr "топоскоп"
+
msgid "Shown Area"
msgstr "Показанная область"
@@ -17599,6 +18003,9 @@ msgstr "...другие возможные способы передвижени
msgid "Information Board"
msgstr "Информационный стенд"
+msgid "Edit Information Board"
+msgstr "Свойства информационного стенда"
+
msgid "Board Content"
msgstr "Содержимое указателя"
@@ -17620,23 +18027,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 "Досуг"
@@ -17765,50 +18184,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 "Конфессия"
@@ -17825,6 +18238,12 @@ msgstr "католики"
msgid "evangelical"
msgstr "евангелисты"
+msgid "greek_catholic"
+msgstr "восточнокатолическая"
+
+msgid "greek_orthodox"
+msgstr "греческое православие"
+
msgid "jehovahs_witness"
msgstr "свидетели Иеговы"
@@ -17837,6 +18256,9 @@ msgstr "методисты"
msgid "mormon"
msgstr "мормоны"
+msgid "new_apostolic"
+msgstr "новоапостольская церковь"
+
msgid "orthodox"
msgstr "православные"
@@ -17855,38 +18277,139 @@ 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 "Общественное здание"
@@ -17975,6 +18498,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 "Здравоохранение"
@@ -18056,12 +18585,66 @@ msgstr "Ветеринария"
msgid "Edit Veterinary"
msgstr "Свойства ветеринарии"
-msgid "Drinking water"
-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 "Телефон"
@@ -18071,6 +18654,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 "Часы"
@@ -18080,30 +18687,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 "Контрастность/четкость"
@@ -18132,7 +18745,7 @@ msgstr "Показывают влажность"
msgid "Recycling"
msgstr "Пункт приёма утильсырья"
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr "Свойства пункта приёма утильсырья"
msgid "Batteries"
@@ -18159,21 +18772,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 "plastic"
-msgstr "пластик"
-
msgid "Amount of Seats"
msgstr "Количество мест"
@@ -18208,18 +18815,24 @@ msgstr "Свойства охотничьей вышки"
msgid "Height"
msgstr "Высота"
+msgctxt "height"
msgid "low"
msgstr "низкая"
+msgctxt "height"
+msgid "half"
+msgstr "половинная"
+
+msgctxt "height"
+msgid "full"
+msgstr "полная"
+
msgid "Hide"
msgstr "Скрытая"
msgid "Lock"
msgstr "Запирается"
-msgid "Drinking Water"
-msgstr "Питьевая вода"
-
msgid "Edit Source of Potable Water"
msgstr "Свойства источника питьевой воды"
@@ -18251,6 +18864,9 @@ msgstr "у водоёма"
msgid "Diameter (in mm)"
msgstr "Диаметр (в мм)"
+msgid "Hydrant Position"
+msgstr "Расположение"
+
msgctxt "hydrant position"
msgid "lane"
msgstr "переулок"
@@ -18288,117 +18904,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 "теннис"
@@ -18432,33 +19084,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-кегельный)"
@@ -18492,6 +19154,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 "Собачьи бега"
@@ -18592,38 +19270,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 "Стрельба"
@@ -18664,21 +19360,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 "Лига регби"
@@ -18815,6 +19507,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 "Машинка на дистанционном управлении"
@@ -18827,59 +19531,133 @@ 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 "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 "Башня"
@@ -19105,42 +19883,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 "Геодезический пункт"
@@ -19148,8 +19952,8 @@ msgstr "Геодезический пункт"
msgid "Edit Survey Point"
msgstr "Свойства геодезического пункта"
-msgid "Surveillance"
-msgstr "Камера наблюдения"
+msgid "Surveillance Camera"
+msgstr "Камера видеонаблюдения"
msgid "Edit Surveillance Camera"
msgstr "Свойства камеры наблюдения"
@@ -19160,12 +19964,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 "Электростанция"
@@ -19205,111 +20099,231 @@ msgstr "солнечная"
msgid "tidal"
msgstr "приливная"
-msgid "waste"
-msgstr "мусор"
+msgid "waste"
+msgstr "мусор"
+
+msgid "wave"
+msgstr "энергия_волн"
+
+msgid "wind"
+msgstr "ветряная"
+
+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 "wave"
-msgstr "энергия_волн"
+msgid "pelton_turbine"
+msgstr "турбина Пелтона"
-msgid "wind"
-msgstr "ветряная"
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr "течение реки / водохранилище"
-msgid "Method"
-msgstr "Способ"
+msgid "reciprocating_engine"
+msgstr "поршневой двигатель"
-msgid "anaerobic_digestion"
-msgstr "анаэробное_сбраживание"
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr "биотопливо, биогаз, дизтопливо, газ, бензин"
-msgid "combustion"
-msgstr "сжигание"
+msgid "solar_photovoltaic_panel"
+msgstr "солнечная фотоэлектрическая панель"
-msgid "dam"
-msgstr "дамба"
+msgid "solar photovoltaic"
+msgstr "солнечный фотогальванический"
-msgid "fission"
-msgstr "деление"
+msgid "solar_thermal_collector"
+msgstr "солнечный коллектор"
-msgid "fusion"
-msgstr "термоядерное слияние"
+msgid "solar thermal"
+msgstr "тепловая энергия солнца"
-msgid "gasification"
-msgstr "газификация"
+msgid "steam_generator"
+msgstr "парогенератор"
-msgid "photovoltaic"
-msgstr "солнечная"
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr "био, уголь, дизтопливо, газ, бензин, масло, сжигание отходов"
-msgid "pumped-storage"
-msgstr "гидроаккумуляция"
+msgid "steam_turbine"
+msgstr "паровая турбина"
-msgid "pumping"
-msgstr "геотермальные воды"
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+"геотермальная / солнечная энергия / биотопливо, уголь, масло, сжигание "
+"отходов"
-msgid "pyrolysis"
-msgstr "пиролиз"
+msgid "stellarator"
+msgstr "стелларатор"
-msgid "run-of-the-river"
-msgstr "ГЭС без резервуара"
+msgid "nuclear fusion"
+msgstr "ядерный синтез"
-msgid "thermal"
-msgstr "тепловая"
+msgid "tokamak"
+msgstr "токамак"
-msgid "Output forms of energy"
-msgstr "Вид генерируемой энергии"
+msgid "vertical_axis"
+msgstr "вертикальная ось"
-msgid "electricity"
-msgstr "электричество"
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr "Кипящий водо-водяной реактор 1 (BWR-1)"
-msgid "2 W"
-msgstr "2 Вт"
+msgid "nuclear fission"
+msgstr "деление ядер"
-msgid "3 kW"
-msgstr "3 кВт"
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr "Кипящий водо-водяной реактор 2 (BWR-2)"
-msgid "5 MW"
-msgstr "5 МВт"
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr "Кипящий водо-водяной реактор 3 (BWR-3)"
-msgid "7 GW"
-msgstr "7 ГВт"
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr "Кипящий водо-водяной реактор 4 (BWR-4)"
-msgid "hot water"
-msgstr "горячая вода"
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr "Кипящий водо-водяной реактор 5 (BWR-5)"
-msgid "hot air"
-msgstr "горячий воздух"
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr "Кипящий водо-водяной реактор 6 (BWR-6)"
-msgid "cold water"
-msgstr "холодная вода"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr "Реактор CANDU (CANada Deuterium Uranium)"
-msgid "cold air"
-msgstr "холодный воздух"
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr "Китайский водо-водяной ядерный реактор (CPR-1000)"
-msgid "compressed air"
-msgstr "сжатый воздух"
+msgid "European Pressurized Reactor (EPR)"
+msgstr "Европейский водо-водяной ядерный реактор (EPR)"
-msgid "steam"
-msgstr "пар"
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr "Инерциальный управляемый термоядерный синтез (ICF)"
-msgid "vacuum"
-msgstr "вакуум"
+msgid "Pressurized water reactor (PWR)"
+msgstr "Водо-водяной ядерный реактор (PWR)"
-msgid "battery charging"
-msgstr "подзарядка аккумуляторов"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr "Реактор большой мощности канальный 1000 (RBMK-1000)"
-msgid "Power Station"
-msgstr "Электроподстанция"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr "Реактор большой мощности канальный 1500 (RBMK-1500)"
-msgid "Edit Power Station"
-msgstr "Свойства электроподстанции"
+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 "Распределительный шкаф"
@@ -19325,6 +20339,9 @@ msgstr "Свойства опоры ЛЭП"
msgid "Tower reference"
msgstr "Номер вышки"
+msgid "steel"
+msgstr "сталь"
+
msgid "Pole"
msgstr "Столб"
@@ -19343,13 +20360,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 "Количество токонесущих кабелей (без грозозащитных)"
@@ -19456,11 +20471,11 @@ msgstr "Киоск"
msgid "Edit Kiosk"
msgstr "Свойства киоска"
-msgid "Baker"
+msgid "Bakery"
msgstr "Булочная"
-msgid "Edit Baker"
-msgstr "Свойства булочной"
+msgid "Edit Bakery"
+msgstr "Свойства пекарни"
msgid "Butcher"
msgstr "Мясная лавка"
@@ -19471,8 +20486,8 @@ msgstr "Свойства мясной лавки"
msgid "Seafood"
msgstr "Морепродукты"
-msgid "Edit Seafood"
-msgstr "Свойства морепродуктов"
+msgid "Edit Seafood Shop"
+msgstr "Свойства магазина морепродуктов"
msgid "Deli (Fine Food)"
msgstr "Деликатесы"
@@ -19492,6 +20507,9 @@ msgstr "Рынок"
msgid "Edit Marketplace"
msgstr "Свойства рынка"
+msgid "Organic"
+msgstr "Натуральные продукты"
+
msgid "Greengrocer"
msgstr "Продавец фруктов или овощей"
@@ -19504,9 +20522,6 @@ msgstr "Фермерский магазин"
msgid "Edit Farm Stand"
msgstr "Свойства фермерского магазина"
-msgid "Organic"
-msgstr "Натуральные продукты"
-
msgid "Edit Organic/Bio"
msgstr "Свойства магазина натуральных продуктов"
@@ -19576,7 +20591,7 @@ msgstr "Свойства портного"
msgid "Fabric"
msgstr "Ткани"
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr "Свойства магазина тканей"
msgid "Electronic"
@@ -19597,14 +20612,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 "Звуковая аппаратура"
@@ -19612,7 +20627,6 @@ msgstr "Звуковая аппаратура"
msgid "Edit Hifi Shop"
msgstr "Свойства магазина звуковой аппаратуры"
-msgctxt "shop"
msgid "Video"
msgstr "Видео"
@@ -19640,6 +20654,12 @@ msgstr "Свойства пункта обмена валют"
msgid "Edit Automated Teller Machine"
msgstr "Свойства банкомата"
+msgid "Pawnbroker"
+msgstr "Ломбард"
+
+msgid "Edit Pawnbroker"
+msgstr "Свойства ломбарда"
+
msgid "Department Store"
msgstr "Универмаг"
@@ -19676,10 +20696,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"
@@ -19709,8 +20750,8 @@ msgstr "Свойства хозяйственного магазина"
msgid "Paint"
msgstr "Краски"
-msgid "Edit Paint"
-msgstr "Свойства красок"
+msgid "Edit Paint Shop"
+msgstr "Свойства магазина красок"
msgid "Furniture"
msgstr "Мебельный"
@@ -19721,20 +20762,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 "Канцтовары"
@@ -19769,8 +20810,8 @@ msgstr "Свойства туристического агентства"
msgid "Musical Instrument"
msgstr "Музыкальные инструменты"
-msgid "Edit Musical Instruments"
-msgstr "Свойства музыкальных инструментов"
+msgid "Edit Musical Instruments Shop"
+msgstr "Свойства магазина музыкальных инструментов"
msgid "Toys"
msgstr "Игрушки"
@@ -19982,6 +21023,12 @@ msgstr "Вершина"
msgid "Edit Peak"
msgstr "Свойства вершины"
+msgid "Saddle"
+msgstr "Перевал"
+
+msgid "Edit Saddle"
+msgstr "Свойства горного перевала"
+
msgid "Glacier"
msgstr "Ледник"
@@ -20021,26 +21068,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 "Лесопосадки"
@@ -20048,15 +21104,6 @@ msgstr "Лесопосадки"
msgid "Edit Forest Landuse"
msgstr "Свойства лесопосадок"
-msgid "coniferous"
-msgstr "Хвойный"
-
-msgid "deciduous"
-msgstr "Лиственный"
-
-msgid "mixed"
-msgstr "Смешанный"
-
msgid "Grassland"
msgstr "Луг"
@@ -20132,6 +21179,12 @@ msgstr "Сенокосный луг"
msgid "Edit Meadow Landuse"
msgstr "Свойства сенокосного луга"
+msgid "Orchard"
+msgstr "Фруктовый сад"
+
+msgid "Edit Orchard Landuse"
+msgstr "Свойства фруктового сада"
+
msgid "Vineyard"
msgstr "Виноградники"
@@ -20186,7 +21239,7 @@ msgstr "Игровая площадка"
msgid "Edit Recreation Ground Landuse"
msgstr "Свойства игровой площадки"
-msgid "Residential area"
+msgid "Residential Area"
msgstr "Жилая зона"
msgid "Edit Residential Landuse"
@@ -20198,6 +21251,9 @@ msgstr "Погост"
msgid "Edit Graveyard"
msgstr "Свойства погоста"
+msgid "shinto"
+msgstr "синтоизм"
+
msgid "Cemetery"
msgstr "Кладбище"
@@ -20273,6 +21329,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 "Правка адресов"
@@ -20309,6 +21392,18 @@ msgstr "чётные"
msgid "alphabetic"
msgstr "алфавитный"
+msgid "Accuracy"
+msgstr "Точность"
+
+msgid "actual"
+msgstr "фактическая"
+
+msgid "estimate"
+msgstr "приблизительная"
+
+msgid "potential"
+msgstr "возможная"
+
msgid "Contact (common schema)"
msgstr "Контакт (обычная схема)"
@@ -20477,21 +21572,50 @@ msgstr "Маршрут"
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 "лыжный"
+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 "Описание знака"
@@ -20537,20 +21661,23 @@ 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 "Ассоциированная улица"
-msgid "Edit associated street"
-msgstr "Свойства связанной улицы"
+msgid "Edit Associated Street"
+msgstr "Свойства ассоциированной улицы"
+
+msgid "house"
+msgstr "дом"
msgid "Street"
msgstr "Улица"
@@ -20573,7 +21700,7 @@ msgstr "что-либо, связанное с улицей"
msgid "Destination sign"
msgstr "Указатель направления"
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr "Свойства указателя направления"
msgid "Destination written on sign (w/o distance)"
@@ -20669,18 +21796,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 "лошадь"
@@ -20690,8 +21826,11 @@ msgstr "ограждение"
msgid "motorroad"
msgstr "дорога для легковых автомобилей"
-msgid "highway_track"
-msgstr "Полевая/лесная дорога"
+msgid "highway.track"
+msgstr "полевая/лесная дорога"
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "услуги"
@@ -20699,11 +21838,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 "берег реки"
@@ -20720,6 +21859,9 @@ msgstr "Водные пороги"
msgid "railwaypoint"
msgstr "ж/д путевая точка"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr "сортировочная станция"
@@ -20735,29 +21877,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 "энергия"
@@ -20777,20 +21919,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 "отель"
@@ -20864,11 +22006,14 @@ msgstr "маршрут"
msgid "boundary"
msgstr "граница"
+msgid "sport"
+msgstr "спорт"
+
msgid "place"
msgstr "место"
-msgid "tiger_data"
-msgstr "данные TIGER"
+msgid "tiger.data"
+msgstr ""
msgid "address"
msgstr "адрес"
@@ -20882,9 +22027,6 @@ msgstr "Город/Село"
msgid "One Way"
msgstr "Односторонняя"
-msgid "Church"
-msgstr "Церковь"
-
msgid "Fuel Station"
msgstr "Заправочная станция"
@@ -20912,6 +22054,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"
@@ -20957,11 +22102,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"
@@ -20972,8 +22147,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"
@@ -20990,8 +22165,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"
@@ -21107,41 +22282,199 @@ 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"
-msgstr "тег bridge без тега highway/railway/waterway"
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr "bridge без highway/railway/waterway/platform/piste/pipeline"
-msgid "psv without highway/railway/waterway"
-msgstr "тег psv без тега highway/railway/waterway"
+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"
-msgstr "тег maxspeed без тега highway/railway/traffic_sign"
+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 "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"
+
+msgid "unknown christian denomination"
+msgstr "неизвестная христианская конфессия"
+
+msgid "unknown muslim denomination"
+msgstr "неизвестная мусульманская конфессия"
+
+msgid "unknown jewish denomination"
+msgstr "неизвестная конфессия иудаизма"
+
+msgid ""
+"no wikipedia-language given, use ''wikipedia''=''language:page title''"
+msgstr ""
+"не указан язык Википедии, используйте ''wikipedia''=''язык:заголовок "
+"страницы''"
+
+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 "religion without denomination"
-msgstr "тег religion без тега denomination"
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+"maxwidth: по умолчанию в метрах; разделитель - точка; единицы измерения "
+"отделяются пробелом"
-msgid "unknown christian denomination"
-msgstr "неизвестная христианская конфессия"
+msgid "unusual maxspeed format"
+msgstr "необычный формат maxspeed"
-msgid "unknown muslim denomination"
-msgstr "неизвестная мусульманская конфессия"
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr "напряжение должно быть в вольтах без единиц/разделителей/пробелов"
-msgid "unknown jewish denomination"
-msgstr "неизвестная конфессия иудаизма"
+msgid "unusual frequency specification"
+msgstr "необычное обозначение частоты"
-msgid ""
-"no wikipedia-language given, use ''wikipedia''=''language:page title''"
-msgstr ""
-"не указан язык Википедии, используйте ''wikipedia''=''язык:заголовок "
-"страницы''"
+msgid "unusual train track gauge; use mm with no separator"
+msgstr "необычная ширина колеи; используйте мм без разделителя"
-msgid "unkown language prefix in wikipedia tag"
-msgstr "неизвестный префикс языка в теге wikipedia"
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr "необычный уклон; используйте проценты/градусы или up/down"
msgid "Landsat"
msgstr "Landsat"
@@ -21152,20 +22485,29 @@ msgstr "Yahoo Sat"
msgid "Bing Sat"
msgstr "Спутниковые снимки Bing"
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr "HDDM (Humanitarian OpenStreetMap)"
+
msgid "MapBox Satellite"
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 чёрно-белый)"
-msgid "Skobbler"
-msgstr "Skobbler"
+msgid "skobbler"
+msgstr "skobbler"
+
+msgid "skobbler heatmap"
+msgstr "Тепловая карта skobbler"
msgid "skobbler heatmap"
msgstr ""
@@ -21185,8 +22527,8 @@ msgstr "OpenStreetMap (Немецкий стиль)"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Камбоджа, Лаос, Таиланд, Вьетнам двуязычная"
-msgid "2u"
-msgstr "2u"
+msgid "osmfr"
+msgstr "osmfr"
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI чёрно-белая 2.5 м"
@@ -21194,20 +22536,23 @@ msgstr "AGRI чёрно-белая 2.5 м"
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr "basemap.at"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Грац: базовая карта"
msgid "Tiris: DGM (Terrain model)"
-msgstr ""
+msgstr "Tiris: DGM (модель рельефа)"
msgid "Tiris: DOM (Surface model)"
-msgstr ""
+msgstr "Tiris: DOM (модель поверхности)"
msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr "Вена: многоцелевая карта (общего назначения)"
msgid "Vienna: Beschriftungen (annotations)"
-msgstr ""
+msgstr "Вена: Beschriftungen (примечания)"
msgid "Vienna: Orthofoto (aerial image)"
msgstr "Вена: ортофото (аэрофотоснимок)"
@@ -21219,21 +22564,21 @@ msgid "VoGIS: Flächenwidmungsplan"
msgstr "VoGIS: План зонирования"
msgid "VoGIS: DGM (Terrain model)"
-msgstr ""
+msgstr "VoGIS: DGM (Модель рельефа)"
msgid "VoGIS: DOM (Surface model)"
-msgstr ""
+msgstr "VoGIS: DOM (Модель поверхности)"
-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 "Эстония, ортофото (Maaamet)"
-msgid "British Columbia Mosaic"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
msgid "Czech CUZK:KM"
@@ -21258,7 +22603,7 @@ msgid "Estonia Ortho (Maaamet)"
msgstr "Эстония, ортофото (Maaamet)"
msgid "Estonia Multi (Maaamet)"
-msgstr ""
+msgstr "Эстония Multi (Maaamet)"
msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr "CRAIG - Овернь 2009/2010 - 30 см"
@@ -21291,7 +22636,7 @@ msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr "Géolittoral V2 - ортофото 2010-2012"
msgid "Géolittoral - Sentiers"
-msgstr ""
+msgstr "Géolittoral - Дороги"
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr "Атлантическая Луара - ортофото 2012 - 20 см"
@@ -21314,7 +22659,7 @@ msgid ""
msgstr "Веркор - заповедник горного массива Веркор - ортофото 1999 - 1 м"
msgid "Streets NRW Geofabrik.de"
-msgstr ""
+msgstr "Улицы Северного Рейна-Вестфалии от Geofabrik.de"
msgid "Hike & Bike"
msgstr "Hike & Bike"
@@ -21326,7 +22671,7 @@ msgid "OpenStreetMap (German Language)"
msgstr "OpenStreetMap (немецкий язык)"
msgid "OpenPT Map (overlay)"
-msgstr ""
+msgstr "Карта OpenPT (наложение)"
msgid "Hamburg (40 cm)"
msgstr "Гамбург (40 см)"
@@ -21340,6 +22685,31 @@ 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 (Гаити)"
@@ -21350,7 +22720,7 @@ msgid "Ireland Bartholomew Quarter-Inch 1940"
msgstr "Ирландия, изд. Bartholomew, четвертьдюймовая, 1940"
msgid "Ireland EEA GMES Urban Atlas"
-msgstr ""
+msgstr "Ирландия EEA GMES Urban Atlas"
msgid "Ireland EEA CORINE 2006"
msgstr "Ирландия EEA CORINE 2006"
@@ -21395,16 +22765,16 @@ msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
msgid "Freemap.sk Car"
-msgstr ""
+msgstr "Freemap.sk автомобильная"
msgid "Freemap.sk Hiking"
-msgstr ""
+msgstr "Freemap.sk пешеходная"
msgid "Freemap.sk Cyclo"
-msgstr ""
+msgstr "Freemap.sk велосипедная"
msgid "Freemap.sk Ski"
-msgstr ""
+msgstr "Freemap.sk лыжные трассы"
msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
msgstr "Кадастровая карта Словакии (KaPor, 2010-04)"
@@ -21413,7 +22783,7 @@ msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
msgstr "Кадастровая карта Словакии (KaPor, 2011-05)"
msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
+msgstr "Словакия EEA GMES Urban Atlas"
msgid "Slovakia EEA CORINE 2006"
msgstr "Словакия EEA CORINE 2006"
@@ -21479,7 +22849,7 @@ msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / Ортофото Ивердон-Ле-Бен 25 см (2007)"
msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
-msgstr ""
+msgstr "Ньон - Ортофото 2010 HD 5см/пикс"
msgid "Cartoriviera - Orthophoto 2012"
msgstr "Cartoriviera - ортофото 2012"
@@ -21488,7 +22858,7 @@ msgid "SIGIP - Orthophoto 2012"
msgstr "SIGIP - Ортофото2012"
msgid "Lausanne - Orthophoto technique 2012"
-msgstr ""
+msgstr "Лозанна - Техническое ортофото 2012"
msgid "MSR Maps Topo"
msgstr ""
@@ -21503,7 +22873,10 @@ msgid "USGS Large Scale Imagery"
msgstr "Крупномасштабные снимки USGS"
msgid "OSM US TIGER 2012 Roads Overlay"
-msgstr ""
+msgstr "Оверлей дорог OSM US TIGER 2012"
+
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr "Новые и смещённые дороги TIGER (TIGER 2013)"
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -21518,16 +22891,16 @@ msgid "Ukraine - Orthophotomaps 2012"
msgstr "Украина - Ортофотокарты 2012"
msgid "7th Series (OS7)"
-msgstr ""
+msgstr "7-ой серии (OS7)"
msgid "OS New Popular Edition historic"
msgstr ""
msgid "OS OpenData StreetView"
-msgstr ""
+msgstr "OS OpenData StreetView"
msgid "OS OpenData Locator"
-msgstr ""
+msgstr "OS OpenData Locator"
msgid "Surrey Air Survey"
msgstr "Суррей, аэросъёмка"
@@ -21536,10 +22909,10 @@ msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS - 6-дюймовая карта Шотландии 1842-82"
msgid "NLS - OS 1:25k 1st Series 1937-61"
-msgstr ""
+msgstr "NLS - OS 1:25000 1-й выпуск 1937-61"
msgid "NLS - OS 1-inch 7th Series 1955-61"
-msgstr ""
+msgstr "NLS - OS 1-дюймовая 7-й выпуск 1955-61"
msgid "OS 1:25k historic (OSM)"
msgstr ""
@@ -21550,6 +22923,39 @@ 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 "delete data after import"
+msgstr "удалить данные после импорта"
+
msgid "Columbus V-900 CSV Files"
msgstr "Файлы Columbus V-900 CSV"
@@ -21762,6 +23168,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 "Открыть окно профилей высоты"
@@ -21783,14 +23201,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}''."
@@ -22065,11 +23477,14 @@ 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 "Housenumber increment:"
-msgstr "Приращение номера дома"
+msgid "House number increment:"
+msgstr "Приращение номера дома:"
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
@@ -22278,8 +23693,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 букв"
@@ -22649,15 +24064,6 @@ msgstr "Номер дома:"
msgid "Street Name:"
msgstr "Улица:"
-msgid "Increment"
-msgstr "Увеличивать"
-
-msgid "Decrement"
-msgstr "Уменьшать"
-
-msgid "Numbers:"
-msgstr "Номера:"
-
msgid "Big buildings mode"
msgstr "Режим больших зданий"
@@ -22849,6 +24255,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 в списке."
@@ -22869,12 +24278,6 @@ msgstr "50 м"
msgid "100 m"
msgstr "100 м"
-msgid "high"
-msgstr "высокое"
-
-msgid "medium"
-msgstr "среднее"
-
msgid "symbol"
msgstr "символ"
@@ -23023,6 +24426,11 @@ msgstr ""
"Добавить \"Tableau(x) d''assemblage\" в список кадастровых листов для "
"захвата."
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+"Заменить оттенки серого белым цветом (уменьшает размер файла и используемой "
+"памяти)."
+
msgid "Display crosspieces:"
msgstr "Показать перекрестья:"
@@ -23043,6 +24451,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=...\" к элементам?"
@@ -23188,10 +24599,10 @@ msgid "Open Cadastre Preferences"
msgstr "Настройки Open Cadastre"
msgid "Refine georeferencing"
-msgstr ""
+msgstr "Уточнить привязку"
msgid "Improve georeferencing (only raster images)"
-msgstr ""
+msgstr "Улучшение привязки (только растровые изображения)"
msgid "Reset cookie"
msgstr "Сбросить куки"
@@ -23292,8 +24703,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 "Векторизован."
@@ -23344,8 +24758,8 @@ msgstr "Удалить выбранную тему из списка."
msgid "Color Schemes"
msgstr "Цветовые схемы"
-msgid "Adress"
-msgstr "CzechAddress"
+msgid "Address"
+msgstr "Адрес"
msgid "Split area"
msgstr "Разделить область"
@@ -23576,27 +24990,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 "Импортирование данных с устройства."
@@ -24751,9 +26147,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 "Левый Мичиганский поворот"
@@ -24993,13 +26414,13 @@ msgid "OpenData XML files"
msgstr "Файлы OpenData XML"
msgid "Download open data"
-msgstr ""
+msgstr "Загрузить ОткрытыеДанные"
msgid "License URL not available: {0}"
msgstr "URL лицензии не доступен: {0}"
msgid "OpenData preferences"
-msgstr ""
+msgstr "Свойства ОткрытыеДанные"
msgid "License Agreement"
msgstr "Лицензионное соглашение"
@@ -25468,9 +26889,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Произошла ошибка: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "Невозможно создать баг. Результат: {0}"
-
msgid "Process queue"
msgstr "Обработать очередь"
@@ -25526,18 +26944,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 "Открыть в браузере"
@@ -25894,6 +27300,27 @@ msgstr "Тест не прошёл: Невозможно прочитать mtim
msgid "Test failed: Could not write mtime."
msgstr "Тест не прошёл: Невозможно записать mtime."
+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}?"
@@ -26049,6 +27476,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"
@@ -26371,9 +27802,6 @@ msgstr "GPX файл не содержит треков или путевых т
msgid "Create Stops from GPX"
msgstr "Создать остановки из GPX"
-msgid "Tracks"
-msgstr "Треки"
-
msgid "Tracks in this GPX file:"
msgstr "Маршруты в GPX файле:"
@@ -26592,6 +28020,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}"
@@ -26627,15 +28058,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 "Страна:"
@@ -26750,9 +28201,6 @@ msgstr "Настройки модуля маршрутизации"
msgid "Configure routing preferences."
msgstr "Задать настройки маршрутизации."
-msgid "Highway type"
-msgstr "Тип автомобильной дороги"
-
msgid "Speed (Km/h)"
msgstr "Скорость (км/ч)"
@@ -26953,20 +28401,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 "Автосохранение данных позиционирования"
@@ -27188,6 +28636,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"
@@ -27226,6 +28770,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..."
@@ -27392,9 +28940,6 @@ msgstr "Подписание отменено!"
msgid "Please give a tolerance in meters"
msgstr "Пожалуйста, укажите допуск в метрах"
-msgid "Accuracy"
-msgstr "Точность"
-
msgid "Select as much as you like:"
msgstr "Выберите столько, сколько нужно:"
@@ -28553,9 +30098,6 @@ msgstr "Снять выделение с точек"
msgid "Removes all nodes from selection"
msgstr "Убрать точки из выделения"
-msgid "Video"
-msgstr "Видео"
-
msgid "Import Video"
msgstr "Импортировать видео"
@@ -28686,7 +30228,7 @@ msgid "mute"
msgstr "отключить звук"
msgid "Walking Papers Scanned Map"
-msgstr ""
+msgstr "Сканированная карта с Walking-Papers.org"
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -28858,9 +30400,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 a49cdd6..9452f6a 100644
--- a/i18n/po/sk.po
+++ b/i18n/po/sk.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-08-23 18:21+0000\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-08-24 04:31+0000\n"
-"X-Generator: Launchpad (build 16738)\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"
@@ -50,6 +50,9 @@ msgstr "Podmienky použitia pozadia"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "Otvorenie odkazu nie je aktuálnou platformou podporované (\"{0}\")"
+msgid "ERROR: {0}"
+msgstr "CHYBA: {0}"
+
msgid "WARNING: {0}"
msgstr "VAROVANIE: {0}"
@@ -59,6 +62,9 @@ msgstr "INFO: {0}"
msgid "DEBUG: {0}"
msgstr "LADENIE: {0}"
+msgid "Cause: "
+msgstr "Príčina: "
+
msgid "Executing platform startup hook"
msgstr "Spúšťam platformu"
@@ -113,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"
@@ -164,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 "
@@ -259,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."
@@ -304,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}"
@@ -340,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"
@@ -359,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"
@@ -474,7 +481,7 @@ 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:"
@@ -552,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)"
@@ -674,17 +684,17 @@ 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 ""
@@ -717,7 +727,7 @@ 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"
@@ -843,17 +853,16 @@ 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}"
@@ -912,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."
@@ -1039,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"
@@ -1054,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 "
@@ -1083,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>"
@@ -1100,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?"
@@ -1144,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"
@@ -1176,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ť"
@@ -1238,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ť?"
@@ -1265,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"
@@ -1276,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"
@@ -1325,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"
@@ -1346,20 +1344,21 @@ 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?"
@@ -1423,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"
@@ -1537,6 +1535,29 @@ 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ť?"
+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äť"
@@ -1631,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ť"
@@ -1690,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"
@@ -1825,13 +1846,16 @@ 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čovské z bodov {2}"
+msgstr "({0}/{1}) Nahrávam rodičov bodu {2}"
msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Nahrávam rodičovské z cesty {2}"
+msgstr "({0}/{1}) Nahrávam rodičov cesty {2}"
msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Nahrávam rodičovské z relácie {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})"
@@ -2084,8 +2108,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
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"
+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"
@@ -2136,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"
@@ -2208,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ácií"
-msgstr[1] "Pridať výber {0} do relácie"
-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í"
@@ -2243,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"
@@ -2261,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"
@@ -2555,7 +2579,10 @@ msgid "''value'' in any key"
msgstr "\"hodnota\" v akomkoľvek kľúči"
msgid "matches if ''key'' exists"
-msgstr "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"
@@ -2686,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 objektov"
+msgstr "Nájdených {0} zodpovedajúcich objektov"
msgctxt "search"
msgid "CS"
@@ -2768,11 +2795,8 @@ msgstr "Chýbajúci parameter pre XOR"
msgid "Missing operator for 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 značky ''{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 "
@@ -2812,7 +2836,7 @@ 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"
@@ -2831,7 +2855,7 @@ msgid "Errors"
msgstr "Chyby"
msgid "Usually this should be fixed."
-msgstr "Obvykle by mali byť opravené."
+msgstr "Obyčajne by mali byť opravené."
msgid "Warnings"
msgstr "Varovania"
@@ -2866,6 +2890,9 @@ 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}"
@@ -2876,7 +2903,7 @@ 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 "Odstrániť \"{0}\" z bodu ''{1}''"
@@ -2902,11 +2929,11 @@ msgstr "Odstrániť \"{0}\" z {1} objektov"
msgid "Set {0}={1} for {2} objects"
msgstr "Nastaviť {0}={1} pre {2} objektov"
-msgid "Deleted {0} properties for {1} objects"
-msgstr "Odstránené {0} vlastností z {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} vlastností pre {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"
@@ -2931,11 +2958,10 @@ 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}\""
@@ -3053,13 +3079,16 @@ msgstr[2] "Posun {0} bodov"
msgid "Purged {0} object"
msgid_plural "Purged {0} objects"
-msgstr[0] "Očistených {0} objektov"
-msgstr[1] "Očistený {0} objekt"
-msgstr[2] "Očistené {0} objekty"
+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 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"
msgstr[0] "Otáčanie {0} bodov"
@@ -3133,11 +3162,11 @@ msgid "Reverse directional way."
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 "Relácia (vzťah)"
@@ -3166,11 +3195,11 @@ msgstr "Použiť zvolené zmeny"
msgid "Do not apply changes"
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 v reláciách odkazujú na"
@@ -3191,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}"
@@ -3224,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 "
@@ -3248,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 "
@@ -3261,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 "
@@ -3288,11 +3318,11 @@ msgstr ""
"<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}"
@@ -3322,14 +3352,11 @@ 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 "So základným objektom \"{0}\" už existuje konflikt."
@@ -3369,10 +3396,10 @@ 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 "Očakávané ID > 0. Prijatá hodnota však bola {0}."
+msgstr "Očakávané ID > 0. Obdržaná hodnota však bola {0}."
msgid "Version > 0 expected. Got {0}."
-msgstr "Očakávané verzia > 0. Prijatá hodnota však bola {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 "
@@ -3454,7 +3481,7 @@ msgstr[2] "body"
msgid "way"
msgid_plural "ways"
-msgstr[0] "cesty"
+msgstr[0] "ciest"
msgstr[1] "cesta"
msgstr[2] "cesty"
@@ -3465,7 +3492,7 @@ msgstr[1] "vzťah (relation)"
msgstr[2] "vzťahy (relations)"
msgid "closedway"
-msgstr "uzavratá cesta"
+msgstr "uzavretá cesta"
msgid "multipolygon"
msgstr "multipolygón"
@@ -3499,13 +3526,12 @@ msgstr ""
"''{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."
@@ -3549,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ý"
@@ -3597,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 ": "
@@ -3609,29 +3635,29 @@ 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 "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)"
@@ -3656,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"
@@ -3699,6 +3722,9 @@ 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"
@@ -3721,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"
@@ -3773,7 +3808,7 @@ msgid "Checks and corrects deprecated tags."
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ý"
@@ -3784,6 +3819,9 @@ 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"
@@ -3809,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"
@@ -3865,11 +3903,20 @@ msgid "Highways"
msgstr "Pozemné komunikácie"
msgid "Performs semantic checks on highways."
-msgstr "Vykonať kontroly zmyslu na cestách."
+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"
@@ -3877,10 +3924,10 @@ 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"
@@ -3889,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ý"
@@ -3907,22 +3954,22 @@ 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."
@@ -3931,10 +3978,10 @@ msgid "Nodes duplicating way tags"
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é značky 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 značky 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"
@@ -3944,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ú."
@@ -3967,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"
@@ -4004,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"
@@ -4044,11 +4097,11 @@ 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ý riadok tagchecker - {0}: {1}"
@@ -4091,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"
@@ -4163,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í."
@@ -4186,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"
@@ -4217,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"
@@ -4229,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"
@@ -4263,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}"
@@ -4270,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}"
@@ -4293,9 +4349,6 @@ msgstr "budova"
msgid "area"
msgstr "oblasť (plocha)"
-msgid "Unclosed way"
-msgstr "Neuzavretá cesta"
-
msgid "Unconnected ways"
msgstr "Nepripojené cesty"
@@ -4312,7 +4365,7 @@ 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 "Neoznačkované a nepripojené body"
@@ -4321,12 +4374,12 @@ 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á značku obsahujúcu ''fixme'' alebo ''FIXME''"
@@ -4352,7 +4405,7 @@ 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é)"
@@ -4387,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)"
@@ -4419,7 +4453,7 @@ 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}"
@@ -4464,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"
@@ -4485,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"
@@ -4506,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ť"
@@ -4532,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"
@@ -4599,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"
@@ -4712,7 +4745,7 @@ 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"
@@ -4759,6 +4792,18 @@ 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"
@@ -4865,20 +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 "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 "{0} ({1} ms)"
msgstr "{0} ({1} ms)"
@@ -4937,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í"
@@ -4967,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:"
@@ -5057,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"
@@ -5143,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\". Prijatá hodnota je {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"
@@ -5161,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"
@@ -5177,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."
@@ -5199,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."
@@ -5206,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."
@@ -5223,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"
@@ -5234,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} vstupov)"
-msgstr[1] "Moja verzia ({0} vstup)"
-msgstr[2] "Moja verzia ({0} vstupy)"
+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} vstupov)"
-msgstr[1] "Spojovaná verzia ({0} vstup)"
-msgstr[2] "Spojovaná verzia ({0} vstupy)"
+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} vstupov)"
-msgstr[1] "Ich verzia ({0} vstup)"
-msgstr[2] "Ich verzia ({0} vstupy)"
-
-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ý."
+msgstr[0] "Ich verzia ({0} položiek)"
+msgstr[1] "Ich verzia ({0} položka)"
+msgstr[2] "Ich verzia ({0} položky)"
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 "
@@ -5326,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:"
@@ -5381,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)"
@@ -5495,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"
@@ -5584,19 +5624,18 @@ msgstr ""
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 ""
@@ -5633,7 +5672,7 @@ 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"
@@ -5697,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}"
@@ -5735,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] "Bolo tam zistených {0} konfliktov."
-msgstr[1] "Bol tam zistený {0} konflikt."
-msgstr[2] "Boli tam zistené {0} konflikty."
+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"
@@ -5802,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"
@@ -5926,7 +5965,7 @@ msgid "Relation: "
msgstr "Relácia: "
msgid "deleted-on-server"
-msgstr "zmazané-na-servery"
+msgstr "zmazané-na-serveri"
msgid "modified"
msgstr "upravené"
@@ -5962,7 +6001,7 @@ msgid "Version: "
msgstr "Verzia: "
msgid "In changeset: "
-msgstr "Vo zmenovom súbore: "
+msgstr "V zmenovom súbore: "
msgid "Tags: "
msgstr "Značky: "
@@ -6014,7 +6053,7 @@ msgid ""
"Range:{0}"
msgstr ""
"\n"
-"Rozsah: {0}"
+"Rozsah:{0}"
msgid ""
"\n"
@@ -6046,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"
@@ -6075,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 "
@@ -6111,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"
@@ -6185,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"
@@ -6269,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"
@@ -6352,9 +6427,9 @@ msgstr "Otvoriť zoznam ľudí, ktorí pracujú na zvolenom objekte."
msgid "{0} Author"
msgid_plural "{0} Authors"
-msgstr[0] "{0} Autorov"
-msgstr[1] "{0} Autor"
-msgstr[2] "{0} Autori"
+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 používateľom"
@@ -6362,10 +6437,9 @@ msgstr "Výber objektov predložených týmto používateľom"
msgid "Launches a browser with information about the user"
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: spustí sa prehliadač iba pre prvých {0} z {1} vybraných "
+"Spustí sa prehliadač informácií iba pre prvých {0} z {1} vybraných "
"používateľov"
msgid ""
@@ -6397,10 +6471,10 @@ 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"
@@ -6544,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"
@@ -6793,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"
@@ -6882,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ý"
@@ -6953,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}?"
@@ -6995,14 +7081,14 @@ 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 so značkami (F1)"
@@ -7029,7 +7115,7 @@ msgid "Copy the key and value of the selected tag to clipboard"
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 značiek do schránky"
@@ -7066,7 +7152,7 @@ msgid "An empty value deletes the 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ť"
@@ -7130,7 +7216,7 @@ 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)"
@@ -7166,9 +7252,8 @@ 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"
@@ -7224,15 +7309,18 @@ 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 "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
msgstr ""
@@ -7242,8 +7330,8 @@ msgid ""
"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."
@@ -7253,8 +7341,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"
@@ -7325,7 +7413,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 "
@@ -7334,7 +7422,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ť"
@@ -7366,7 +7454,7 @@ msgstr ""
"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"
@@ -7440,7 +7528,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 "
@@ -7468,7 +7556,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í"
@@ -7516,6 +7604,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"
@@ -7554,16 +7663,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"
@@ -7576,7 +7685,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."
@@ -7654,7 +7763,7 @@ 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 "
+"<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>"
@@ -7664,21 +7773,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, "
@@ -7690,28 +7786,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"
@@ -7749,13 +7826,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}"
@@ -7822,10 +7899,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."
@@ -7932,6 +8009,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"
@@ -8006,7 +8086,7 @@ msgid ""
msgstr ""
"<html>Nahrávanie <strong>neúspešné</strong> pretože server má novú verziu "
"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 "
+"<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>"
@@ -8041,9 +8121,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ť"
@@ -8065,6 +8144,12 @@ 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:"
@@ -8133,10 +8218,9 @@ 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"
@@ -8219,11 +8303,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 "
@@ -8239,11 +8323,10 @@ msgid "Missing user identity"
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 používateľovi pre aktuálneho "
-"použí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"
@@ -8498,12 +8581,6 @@ 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 "
@@ -8518,14 +8595,34 @@ msgstr ""
"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 "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"
+msgid "Please specify a changeset source"
+msgstr "Prosím zadajte zdroj súboru zmien"
-msgid "Cancel and return to the previous dialog"
-msgstr "Zrušiť a návrat na predchádzajúci dialóg"
+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 "Do not show this message again"
-msgstr "Túto správu už znovu nezobrazovať"
+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"
+
+msgid "Cancel and return to the previous dialog"
+msgstr "Zrušiť a návrat na predchádzajúci dialóg"
+
+msgid "Do not show this message again"
+msgstr "Túto správu už znovu nezobrazovať"
msgid "Please enter a valid chunk size first"
msgstr "Prosím najskôr vložte platnú veľkosť"
@@ -8533,6 +8630,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"
@@ -8540,11 +8659,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 ..."
@@ -8561,11 +8680,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"
@@ -8614,17 +8732,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}''"
@@ -8689,9 +8807,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 ..."
@@ -8703,6 +8818,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>"
@@ -8723,9 +8841,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:"
@@ -8743,14 +8861,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 ""
@@ -8885,7 +9003,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"
@@ -8918,8 +9036,8 @@ 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"
@@ -9041,7 +9159,7 @@ 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 ""
+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é"
@@ -9070,7 +9188,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"
@@ -9299,9 +9418,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..."
@@ -9320,6 +9436,9 @@ 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"
@@ -9381,6 +9500,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"
@@ -9463,9 +9588,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"
@@ -9479,13 +9601,13 @@ msgid "No timestamp"
msgstr "Bez časovej značky"
msgid "Select to download OSM data."
-msgstr ""
+msgstr "Zvoľte pre stiahnutie dát OSM."
msgid "Select to download GPS traces."
-msgstr ""
+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"
@@ -9666,17 +9788,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}''..."
@@ -9697,10 +9814,9 @@ 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."
-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é"
@@ -9710,11 +9826,10 @@ 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:"
@@ -9984,8 +10099,8 @@ 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}''"
@@ -10621,7 +10736,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."
@@ -10631,13 +10746,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"
@@ -10726,10 +10841,12 @@ msgid "Load profile"
msgstr "Načítať profil"
msgid "Save {0} profile"
-msgstr "Uložiť profil {0}"
+msgstr "Uložiť profil skupiny nastavení \"{0}\""
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"
@@ -10774,9 +10891,9 @@ msgid "Add setting"
msgstr "Pridať nastavenie"
msgid "Advanced Background: Changed"
-msgstr ""
+msgstr "Pokročilé pozadie: Zmenené"
-msgid "Advanced Background: NonDefalut"
+msgid "Advanced Background: NonDefault"
msgstr ""
msgid "Current value is default."
@@ -10836,13 +10953,16 @@ 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 body"
@@ -10904,14 +11024,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"
@@ -11140,7 +11267,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"
@@ -11158,25 +11285,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é)"
@@ -11188,7 +11320,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"
@@ -11197,19 +11329,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. Select image format"
-msgstr ""
+msgstr "3. Vyberte formát obrázka"
msgid "4. Verify generated WMS URL"
-msgstr ""
+msgstr "4. Overte vytvorený WMS URL"
msgid "5. Enter name for this layer"
-msgstr ""
+msgstr "5. Zadajte názov pre túto vrstvu"
msgid "Show Bounds"
msgstr "Zobraziť hranice"
@@ -11266,7 +11398,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"
@@ -11323,7 +11455,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: "
@@ -11385,6 +11517,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"
@@ -11430,7 +11568,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"
@@ -11452,8 +11591,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"
@@ -11537,8 +11676,8 @@ msgstr ""
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"
@@ -11595,7 +11734,7 @@ 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}"
@@ -11637,13 +11776,13 @@ msgid "Ellipsoid parameters"
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 "Zabudované:"
@@ -11732,21 +11871,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"
@@ -11768,6 +11892,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}''"
@@ -11832,11 +11971,11 @@ 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 ""
-"Varovanie: Nepodporovaná hodnota ''{1}'' v predvoľbe ''{0}'. Používa sa "
-"základné overenie totožnosti (Basic Authentication)."
+"Nepodporovaná hodnota v nastavení \"{0}\", obdržaná hodnota je \"{1}\". "
+"Použije sa \"Základné overenie totožnosti\"."
msgid "OSM username:"
msgstr "OSM používateľské meno:"
@@ -11844,29 +11983,34 @@ 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ť prihlasovacie údaje pre OSM zo správcu "
-"prihlasovacích údajov."
+"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 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ť prihlasovacie údaje pre OSM do správcu "
-"prihlasovacích údajov."
+"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 autorizačný prístup zo správcu "
-"prihlasovacích údajov"
+"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 autorizačný prístup do správcu "
-"prihlasovacích údajov"
+"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. "
@@ -11957,24 +12101,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"
@@ -12042,8 +12179,8 @@ msgstr "Použiť predvolené"
msgid "New relation"
msgstr "Nová relácia"
-msgid "Change Properties"
-msgstr "Zmeniť vlastnosti"
+msgid "Change Tags"
+msgstr "Upraviť značky"
msgid "Unknown requisite: {0}"
msgstr "Neznámy žiadaný: {0}"
@@ -12131,9 +12268,6 @@ msgstr "Prednastavené úlohy prvkom, bez materských"
msgid "Preset sub element without parent"
msgstr "Prednastavený sub prvok bez materských"
-msgid "Could not read tagging preset source: {0}"
-msgstr "Nemôžem načítať zdroj predvolieb značenia: {0}"
-
msgid "Error parsing {0}: "
msgstr "Chyba rozkladania(parsovania) {0}: "
@@ -12152,6 +12286,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 (*.*)"
@@ -12185,9 +12329,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 ""
@@ -12207,7 +12402,7 @@ 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úci základný objekt s "
+"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}"
@@ -12223,32 +12418,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'' "
@@ -12263,48 +12460,48 @@ msgstr ""
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 ..."
@@ -12406,6 +12603,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}."
@@ -12421,15 +12621,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}."
@@ -12442,8 +12651,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 ""
@@ -12519,8 +12728,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!"
@@ -12545,12 +12754,12 @@ msgstr ""
msgid "Unexpected format of ID replied by the server. Got ''{0}''."
msgstr ""
-"Neočakávaný formát ID v odpovedi zo servera. Prijatá hodnota je \"{0}\"."
+"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 nového základného objektu \"{0}\". Prijatá "
+"Neočakávaný formát novej verzie nového základného objektu \"{0}\". Obdržaná "
"hodnota je \"{1}\"."
msgid "Creating changeset..."
@@ -12560,7 +12769,7 @@ msgid "Successfully opened changeset {0}"
msgstr "Úspešne otvorený súbor zmien {0}"
msgid "Changeset ID > 0 expected. Got {0}."
-msgstr "Očakávané ID zmenového súboru > 0. Prijatá hodnota však bola {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..."
@@ -12581,7 +12790,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."
@@ -12597,7 +12806,7 @@ 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 ""
-"Očakával sa otvorený zmenový súbor. Prijatý bol však uzavretý zmenový súbor "
+"Očakával sa otvorený zmenový súbor. Obdržaný bol však uzavretý zmenový súbor "
"s ID {0}."
msgid "(Code={0})"
@@ -12628,46 +12837,15 @@ 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 ""
-"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 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 "
@@ -12677,24 +12855,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 "Neplatná hodnota pre vlastnosť \"{0}\". Prijatá hodnota je \"{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á logická hodnota pre vlastnosť \"{0}\". Prijatá hodnota je \"{1}\"."
+"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}."
@@ -12709,11 +12888,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 "(na riadku {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 ""
@@ -12754,8 +12931,8 @@ 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"
@@ -12765,7 +12942,7 @@ 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>. Prijatá hodnota je {0}."
+"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"
@@ -12776,7 +12953,7 @@ 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}. Prijatá "
+"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}."
@@ -12785,8 +12962,8 @@ 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}. Prijatá "
-"hodnota je {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"
@@ -12805,17 +12982,17 @@ msgid ""
"{1}."
msgstr ""
"Neplatná hodnota pre vlastnosť \"version\" (verzia) na OSM základnom objekte "
-"s ID {0}. Prijatá hodnota je {1}"
+"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: Normalizuje sa hodnota vlastnosti \"version\" (verzia) prvku {0} "
-"na {2}, API verzia je ''{3}''. Prijatá hodnota je {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á verzia API. Prijatá hodnota je {0}."
+msgstr "Neznáma, alebo nepodporovaná verzia API. Obdržaná hodnota je {0}."
msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
msgstr ""
@@ -12825,18 +13002,18 @@ 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}\". Prijatá hodnota je \"{1}\""
+"Neplatná dlhá hodnota pre vlastnosť \"{0}\". Obdržaná hodnota je \"{1}\""
msgid "Prepare OSM data..."
msgstr "Pripravujem OSM údaje..."
@@ -12909,8 +13086,8 @@ 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 ""
-"Neplatná hodnota pre vlastnosť \"{0}\" na XML značke (tagu) \"{1}\". Prijatá "
-"hodnota je {2}."
+"Neplatná hodnota pre vlastnosť \"{0}\" na XML značke (tagu) \"{1}\". "
+"Obdržaná hodnota je {2}."
msgid "Reading user info ..."
msgstr "Čítam používateľské info ..."
@@ -12932,7 +13109,7 @@ 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 ..."
@@ -13023,8 +13200,15 @@ 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 "RemoteControl::Accepting connections on port {0}"
msgstr ""
@@ -13033,13 +13217,13 @@ msgid "RemoteControl::Server stopped."
msgstr ""
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 "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}"
@@ -13054,30 +13238,42 @@ 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ť?"
@@ -13089,13 +13285,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:"
@@ -13103,25 +13300,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}"
@@ -13130,6 +13327,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."
@@ -13137,6 +13336,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"
@@ -13144,6 +13352,9 @@ 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}''."
@@ -13216,18 +13427,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}''"
@@ -13403,11 +13614,11 @@ msgstr[2] ""
msgid "Plugin update failed"
msgstr "Aktualizácia pluginu zlyhala"
-msgid "Warning: failed to find plugin {0}"
-msgstr "Varovanie: nepodarilo sa nájsť plugin {0}"
+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"
@@ -13421,29 +13632,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 ""
-"\"Varovanie: nepodarilo sa nainštalovať plugin \"{0}\" z dočasne stiahnutého "
-"súboru \"{1}\". {2}"
+"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}''"
@@ -13513,51 +13723,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"
@@ -13865,7 +14088,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}'' "
@@ -13949,6 +14172,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>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, "
@@ -13977,7 +14203,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, "
@@ -13995,6 +14221,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 "
@@ -14003,9 +14232,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}."
@@ -14020,16 +14249,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 "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 access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+"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}"
+"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]"
@@ -14041,11 +14268,58 @@ msgstr ""
"Nepodarilo sa otvoriť URL. V súčasnej dobe neexistuje nastavenie platformy. "
"Prosím nastavte najskôr platformu."
-msgid "reserved"
-msgstr "rezervované"
+msgid "Opening URL: {0}"
+msgstr "Otvára sa URL: {0}"
-msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
+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 "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!"
@@ -14078,8 +14352,23 @@ 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ý 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 "
@@ -14092,8 +14381,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: "
@@ -14110,7 +14399,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."
@@ -14204,7 +14493,7 @@ msgstr "poľnohospodárska pôda"
msgctxt "landuse"
msgid "residential"
-msgstr "obytná (osídlená)"
+msgstr "obytná (osídlená) zóna"
msgctxt "natural"
msgid "scrub"
@@ -14216,7 +14505,7 @@ msgstr ""
msgctxt "Relation type"
msgid "boundary"
-msgstr "hranica (boundary)"
+msgstr "hranica (územie)"
msgctxt "Relation type"
msgid "enforcement"
@@ -14224,7 +14513,7 @@ msgstr "vynútenie"
msgctxt "Relation type"
msgid "line"
-msgstr "čiara"
+msgstr "elektrické vedenie"
msgctxt "Relation type"
msgid "multipolygon"
@@ -14240,7 +14529,7 @@ msgstr "hromadná doprava"
msgctxt "Relation type"
msgid "restriction"
-msgstr "obmedzenie"
+msgstr "dopravné obmedzenie"
msgctxt "Relation type"
msgid "route"
@@ -14331,7 +14620,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"
@@ -14424,6 +14713,13 @@ 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 ""
@@ -14517,6 +14813,8 @@ 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 "
@@ -14535,7 +14833,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."
@@ -14547,6 +14845,8 @@ 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 ""
@@ -14555,6 +14855,8 @@ 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 "
@@ -14665,10 +14967,10 @@ 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"
@@ -14699,6 +15001,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."
@@ -14723,7 +15028,7 @@ msgid ""
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."
+msgstr "Panel na vytváranie a úpravu relácií a multipolygónov."
msgid "Plugin for reverting changesets"
msgstr "Plugin pre obnovu súborov zmien"
@@ -14758,9 +15063,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 ""
@@ -14778,7 +15080,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 "
@@ -14804,6 +15106,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"
@@ -14941,6 +15248,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"
@@ -14948,19 +15258,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"
@@ -15017,7 +15327,7 @@ 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"
@@ -15031,6 +15341,50 @@ 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"
@@ -15049,11 +15403,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)"
@@ -15062,10 +15416,13 @@ 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"
@@ -15091,18 +15448,12 @@ msgstr "kruhový objazd (roundabout)"
msgid "jughandle"
msgstr "prípojka"
-msgid "yes"
-msgstr "áno"
-
msgid "Road Restrictions"
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"
@@ -15112,9 +15463,6 @@ msgstr "Obmedzenia spôsobu prepravy"
msgid "General Access"
msgstr "Všeobecný prístup"
-msgid "destination"
-msgstr "návštevníci cieľa (destination)"
-
msgid "delivery"
msgstr "zásobovanie (delivery)"
@@ -15124,15 +15472,15 @@ msgstr "permissive (súhlas vlastníka pozemku zatiaľ existuje)"
msgid "private"
msgstr "súkromné (len so súhlasom vlastníka)"
+msgid "customers"
+msgstr "zákazníci"
+
msgid "agricultural"
msgstr "farmárstvo (agricultural)"
msgid "forestry"
msgstr "lestníctvo"
-msgid "no"
-msgstr "nie"
-
msgid "official"
msgstr "oficiálne určené"
@@ -15161,7 +15509,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"
@@ -15176,7 +15524,10 @@ msgid "High-occupancy vehicles (hov)"
msgstr "Vozidlá vysoko obsadené (hov)"
msgid "Public Service Vehicles (psv)"
-msgstr "Dopravná obsluha (psv)"
+msgstr "Dopravná obsluha (bus+taxi) (psv)"
+
+msgid "Tourist buses"
+msgstr "Turistické autobusy"
msgid "Min. speed (km/h)"
msgstr "Min. rýchlosť (km/h)"
@@ -15221,10 +15572,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"
@@ -15242,19 +15593,19 @@ 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 "Upraviť most"
@@ -15262,6 +15613,9 @@ msgstr "Upraviť most"
msgid "viaduct"
msgstr "viadukt (nadjazd)"
+msgid "suspension"
+msgstr "visutý"
+
msgid "swing"
msgstr "otočný"
@@ -15379,21 +15733,30 @@ msgstr ""
msgid "Visibility"
msgstr "Viditeľnosť"
+msgctxt "trail_visibility"
msgid "excellent"
msgstr "vynikajúca"
+msgctxt "trail_visibility"
msgid "good"
msgstr "dobrá"
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr "stredná"
+msgctxt "trail_visibility"
msgid "bad"
msgstr "zlá"
+msgctxt "trail_visibility"
msgid "horrible"
msgstr "hrozná"
+msgctxt "trail_visibility"
+msgid "no"
+msgstr "žiadna"
+
msgid "Wheelchairs"
msgstr "Vozíky"
@@ -15409,10 +15772,10 @@ 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"
@@ -15448,8 +15811,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"
@@ -15479,7 +15842,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"
@@ -15517,14 +15880,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ý"
@@ -15538,36 +15907,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 "Typ prechodu 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)"
@@ -15578,6 +15947,9 @@ msgstr "Odpočívadlo"
msgid "Mini-roundabout"
msgstr "Malý kruhový objazd"
+msgid "Edit Mini-Roundabout"
+msgstr "Upraviť malý kruhový objazd"
+
msgid "Direction"
msgstr "Smer"
@@ -15585,13 +15957,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ť prechod pre chodcov"
+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"
@@ -15623,9 +15992,6 @@ 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 áut)"
@@ -15657,7 +16023,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 "Block"
msgstr "Balvan (Block)"
@@ -15683,8 +16064,11 @@ 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 "Edit Cycle Barrier"
msgstr "Upraviť cyklo-prekážku"
@@ -15694,9 +16078,7 @@ 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 ""
@@ -15710,7 +16092,7 @@ msgid "Spikes"
msgstr "Špičky (hroty)"
msgid "Edit Spikes"
-msgstr "Upraviť Hroty"
+msgstr "Upraviť hroty"
msgid "Toll Booth"
msgstr "Mýtna búdka"
@@ -15734,7 +16116,7 @@ msgid "Height (meters)"
msgstr "Výška (metre)"
msgid "Genus"
-msgstr "Rod (genus)"
+msgstr "Rod (Genus)"
msgid "Species"
msgstr "Druh (Species)"
@@ -15752,25 +16134,19 @@ msgid "barbed_wire"
msgstr "ostnatý drôt"
msgid "chain_link"
-msgstr "pletivo"
+msgstr "drôtené pletivo"
msgid "electric"
msgstr "elektrický"
-msgid "roundpole"
-msgstr "drevené brvná (roundpole)"
+msgid "pole"
+msgstr "stĺpy"
msgid "split_rail"
-msgstr "rozchod železnice"
-
-msgid "chain"
-msgstr "reťaz"
+msgstr "hranaté brvná (split_rail)"
-msgid "hedge"
-msgstr "Živý plot (hedge)"
-
-msgid "pole"
-msgstr "stožiar (pole)"
+msgid "wire"
+msgstr "drôt"
msgid "Guard Rail"
msgstr "Zvodidlá"
@@ -15800,6 +16176,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr "Priekopa (ditch)"
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr "Upraviť priekopu"
@@ -15809,11 +16186,11 @@ msgstr "Obrubník"
msgid "Edit Kerb"
msgstr "Upraviť obrubník"
-msgid "Entrance"
-msgstr "Vstup"
+msgid "Entrance (barrier opening)"
+msgstr "Vstup (otvor v prekážke)"
-msgid "Edit Entrance"
-msgstr "Upraviť vstup"
+msgid "Edit Entrance (barrier opening)"
+msgstr "Upraviť vstup (otvor v prekážke)"
msgid "Gate"
msgstr "Brána"
@@ -15825,25 +16202,31 @@ 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 "Chain"
msgstr "Reťaz"
@@ -15852,10 +16235,10 @@ msgid "Edit Chain"
msgstr "Upraviť reťaz"
msgid "Stile"
-msgstr "Prechod cez plot"
+msgstr "Priechod cez prekážku"
msgid "Edit Stile"
-msgstr "Upraviť prechod cez plot"
+msgstr "Upraviť priechod cez prekážku"
msgid "ladder"
msgstr "rebrík"
@@ -15866,17 +16249,11 @@ msgstr "štrbina"
msgid "stepover"
msgstr "schody"
-msgid "Material"
-msgstr "Materiál"
-
-msgid "stone"
-msgstr "kameň"
-
msgid "Turnstile"
msgstr "Turniket"
msgid "Edit Turnstile"
-msgstr "Upraviť Turniket"
+msgstr "Upraviť turniket"
msgid "Sally Port"
msgstr ""
@@ -15888,10 +16265,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"
@@ -15903,22 +16280,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"
@@ -15935,12 +16312,21 @@ msgstr "Upraviť odvodňovací kanál, odtok"
msgid "Ditch"
msgstr "Priekopa (ditch)"
+msgid "Edit Ditch"
+msgstr "Upraviť priekopu"
+
msgid "Stream"
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)"
@@ -15980,20 +16366,17 @@ 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 "Nádrž na dažďovú vodu"
@@ -16016,11 +16399,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"
@@ -16097,20 +16495,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"
@@ -16122,7 +16525,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"
@@ -16173,7 +16576,7 @@ msgid "branch"
msgstr "vetva"
msgid "industrial"
-msgstr "závody"
+msgstr "priemysel"
msgid "military"
msgstr "armáda"
@@ -16184,8 +16587,8 @@ msgstr "cestovanie"
msgid "freight"
msgstr "náklad"
-msgid "Service/Type"
-msgstr "Služba/Typ"
+msgid "Service type"
+msgstr "Využitie"
msgid "yard"
msgstr "železničná vlečka v závode"
@@ -16208,14 +16611,17 @@ 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"
@@ -16223,9 +16629,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"
@@ -16275,7 +16678,42 @@ 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 "Supervised"
msgstr "Strážené"
@@ -16299,10 +16737,13 @@ 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"
@@ -16357,7 +16798,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"
@@ -16401,27 +16842,23 @@ msgstr "Posuvný pás"
msgid "Edit Magic Carpet"
msgstr "Upraviť posuvný pás"
-msgctxt "aerialway"
msgid "Goods"
-msgstr "Tovar (nákladná lanovka)"
+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"
@@ -16440,12 +16877,12 @@ msgstr "povrchové"
msgid "underground"
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"
@@ -16473,9 +16910,6 @@ msgstr "Parkovacie miesto"
msgid "Edit Parking space"
msgstr "Upraviť parkovacie miesto"
-msgid "rooftop"
-msgstr "zastrešené"
-
msgid "Capacity"
msgstr "Kapacita"
@@ -16497,17 +16931,37 @@ 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 "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 "Vstup na parkovisko"
msgid "Edit Parking entrance"
-msgstr "Upraviť Vstup na parkovisko"
+msgstr "Upraviť vstup na parkovisko"
msgid "Fuel"
msgstr "Čerpacia stanica"
@@ -16650,6 +17104,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)"
@@ -16671,6 +17128,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"
@@ -16698,6 +17161,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.)"
@@ -16705,13 +17174,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"
@@ -16722,22 +17191,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"
@@ -16759,9 +17212,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Náhradné diely"
-
msgid "Clothes"
msgstr "Oblečenie"
@@ -16775,7 +17225,7 @@ msgid "ground_slots"
msgstr "zárezy v zemi"
msgid "informal"
-msgstr "každodenný"
+msgstr "neoficiálny"
msgid "lockers"
msgstr "skrinky"
@@ -16948,7 +17398,7 @@ msgid "UIC name"
msgstr "UIC názov"
msgid "Stop Position"
-msgstr "Poloha zastávky"
+msgstr "Miesto zastavenia"
msgid "Platform"
msgstr "Nástupište"
@@ -16956,6 +17406,9 @@ msgstr "Nástupište"
msgid "Station or amenities"
msgstr "Stanica alebo vybavenosť"
+msgid "Edit Stop Position"
+msgstr "Upraviť miesto zastavenia"
+
msgid "Bus"
msgstr "Autobus"
@@ -16986,6 +17439,9 @@ msgstr "Lanovka"
msgid "Ferry"
msgstr "Trajekt"
+msgid "Edit Platform"
+msgstr "Upraviť nástupište"
+
msgid "Bench"
msgstr "Lavička"
@@ -16998,9 +17454,6 @@ msgstr "Invalidný vozík"
msgid "limited"
msgstr "omedzený"
-msgid "only"
-msgstr "iba"
-
msgid "Highway platform (legacy)"
msgstr "Cestné nástupište (zastaralé)"
@@ -17010,8 +17463,13 @@ 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"
@@ -17025,6 +17483,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"
@@ -17049,14 +17510,6 @@ msgstr "Prístupové alebo vernostné karty"
msgid "Public Transport (legacy)"
msgstr "Hromadná doprava (zastaralé)"
-msgctxt "railway"
-msgid "Station"
-msgstr "Železničná stanica"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Upraviť železničnú stanicu"
-
msgid "UIC-Reference"
msgstr "UIC-Číslo"
@@ -17094,7 +17547,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"
@@ -17105,17 +17558,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"
@@ -17159,12 +17612,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ť"
@@ -17181,21 +17649,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"
@@ -17296,7 +17749,7 @@ msgid "indian"
msgstr "indická"
msgid "regional"
-msgstr "regionálna"
+msgstr "regionálna (domáca)"
msgid "kebab"
msgstr "kebab"
@@ -17385,9 +17838,6 @@ msgstr "Striptízový klub"
msgid "Edit Stripclub"
msgstr "Upraviť striptízový klub"
-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 "Tourism"
msgstr "Turistika"
@@ -17409,9 +17859,15 @@ 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"
@@ -17424,6 +17880,9 @@ msgstr "pouličná sieť"
msgid "scheme"
msgstr "prehľadová (orientačná)"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Zobrazená oblasť"
@@ -17463,6 +17922,9 @@ 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 "Informácie na tabuli"
@@ -17484,23 +17946,35 @@ 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"
@@ -17533,7 +18007,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"
@@ -17545,7 +18019,7 @@ msgid "Sauna"
msgstr "Sauna"
msgid "Edit Sauna"
-msgstr "Upraviť Saunu"
+msgstr "Upraviť saunu"
msgid "Horse riding"
msgstr "Jazdenie na koni"
@@ -17629,50 +18103,44 @@ msgstr "Umelecké dielo"
msgid "Edit Artwork"
msgstr "Upraviť umelecké dielo"
-msgid "Place of Worship"
-msgstr "Kostol (náboženské miesto)"
-
-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é)"
@@ -17689,35 +18157,88 @@ 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ícky"
+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"
@@ -17725,32 +18246,89 @@ 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 pre návštevníkov"
+msgid "reform"
+msgstr "reformovaná"
-msgid "Recording Studio"
-msgstr "Nahrávacie štúdio"
+msgid "Buddhist Temple"
+msgstr "Budhistický chrám"
-msgid "Edit Studio"
-msgstr "Upraviť nahrávacie štúdio"
+msgid "Edit Buddhist Temple"
+msgstr "Upraviť budhistický chrám"
-msgid "audio"
-msgstr "hudba (audio)"
+msgid "theravada"
+msgstr ""
-msgid "video"
-msgstr "filmy (video)"
+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"
@@ -17822,7 +18400,7 @@ msgid "University"
msgstr "Univerzita (Vysoká škola)"
msgid "Edit University"
-msgstr "Upraviť Univerzitu"
+msgstr "Upraviť univerzitu"
msgid "College"
msgstr "Stredná škola"
@@ -17839,6 +18417,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"
@@ -17867,16 +18451,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ň"
@@ -17920,12 +18504,66 @@ msgstr "Veterinár"
msgid "Edit Veterinary"
msgstr "Upraviť veterinárnu ambulanciu"
-msgid "Drinking water"
-msgstr "Pitná voda"
+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"
@@ -17935,39 +18573,69 @@ 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 "Hodiny"
+msgstr "Upraviť hodiny"
msgid "Display"
msgstr "Zobrazenie"
-msgctxt "display"
msgid "analog"
msgstr "analógové"
-msgctxt "display"
msgid "digital"
msgstr "digitálne"
-msgctxt "display"
msgid "sundial"
msgstr "slnečné"
-msgctxt "display"
msgid "unorthodox"
-msgstr "neortodoxný"
+msgstr "nezvyčajné"
msgid "Support"
-msgstr "Umiestnenie"
+msgstr "Upevnenie"
+
+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ť"
@@ -17996,8 +18664,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"
@@ -18023,22 +18691,15 @@ msgstr "stredisko"
msgid "Waste Basket"
msgstr "Odpadkový kôš"
-msgid "Edit Waste Basket"
-msgstr "Upraviť odpadkový kôš"
-
msgid "Waste Disposal"
msgstr "Zhromaždisko odpadu (napr. kontajner)"
-msgid "Edit Waste Disposal"
-msgstr ""
-"Upraviť zhromaždisko odpadu (ktoré nie je pre náhodných okoloidúcich)"
+msgid "Edit Bench"
+msgstr "Upraviť lavičku"
msgid "Backrest"
msgstr "Operadlo chrbta (Backrest)"
-msgid "plastic"
-msgstr "plast"
-
msgid "Amount of Seats"
msgstr "Počet sedadiel"
@@ -18073,8 +18734,17 @@ 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á"
+
+msgctxt "height"
+msgid "full"
+msgstr "plná"
msgid "Hide"
msgstr "Skrýša"
@@ -18082,9 +18752,6 @@ msgstr "Skrýša"
msgid "Lock"
msgstr "Zámok"
-msgid "Drinking Water"
-msgstr "Pitná voda"
-
msgid "Edit Source of Potable Water"
msgstr "Upraviť zdroj pitnej vody"
@@ -18116,6 +18783,9 @@ msgstr "nádrž"
msgid "Diameter (in mm)"
msgstr "Priemer (v mm)"
+msgid "Hydrant Position"
+msgstr "Umiestnenie"
+
msgctxt "hydrant position"
msgid "lane"
msgstr "jazdný pruh"
@@ -18153,121 +18823,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-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 "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 "ragbyová liga"
+msgctxt "sport"
msgid "rugby_union"
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"
@@ -18301,33 +19007,43 @@ 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)"
+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 "9-kuželkový bowling"
msgid "Edit 9pin"
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)"
@@ -18361,6 +19077,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"
@@ -18417,7 +19149,7 @@ 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 (klzisko)"
@@ -18426,7 +19158,7 @@ msgid "Skateboard"
msgstr "Skateboard"
msgid "Edit Skateboard"
-msgstr "Upraviť Skateboard"
+msgstr "Upraviť skateboardové športovisko"
msgid "Swimming"
msgstr "Plávanie"
@@ -18453,7 +19185,7 @@ msgid "nordic"
msgstr "beh na lyžiach (nordic)"
msgid "skitour"
-msgstr "(nordic+downhill)"
+msgstr "lyžiarsky okruh (nordic+downhill)"
msgid "snow_park"
msgstr "park zimných športov"
@@ -18461,36 +19193,54 @@ 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 "Úprava trate"
+msgctxt "piste:grooming"
msgid "classic"
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 "klasická+korčuľovanie na lyžiach"
+msgctxt "piste:grooming"
msgid "scooter"
msgstr "snežným skútrom"
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr "cez krajinu (backcountry)"
@@ -18513,13 +19263,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"
@@ -18533,19 +19283,15 @@ msgstr "Galské hry"
msgid "Edit Gaelic Games"
msgstr "Upraviť galské hry"
-msgctxt "gaelic game"
msgid "Hurling"
msgstr "Hurling"
-msgctxt "gaelic game"
msgid "Football"
-msgstr "Americký futbal"
+msgstr "Galský futbal"
-msgctxt "gaelic game"
msgid "Camogie"
msgstr "Camogie"
-msgctxt "gaelic game"
msgid "Rounders"
msgstr "Rounders"
@@ -18553,7 +19299,7 @@ msgid "Rugby League"
msgstr "Ragbyová liga (1. varianta ragby)"
msgid "Edit Rugby League"
-msgstr "Upraviť Ragbyovú ligu"
+msgstr "Upraviť ragbyovú ligu"
msgid "Rugby Union"
msgstr "Ragbyová Únia (2. varianta ragby)"
@@ -18577,13 +19323,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"
@@ -18682,7 +19428,19 @@ 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á"
@@ -18696,59 +19454,133 @@ msgstr "Človekom vytvorené (Man made)"
msgid "Edit Building"
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"
+msgctxt "building"
+msgid "residential"
+msgstr "obytná"
+
+msgctxt "building"
msgid "apartments"
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"
@@ -18802,13 +19634,13 @@ msgid "water"
msgstr "voda"
msgid "gas"
-msgstr "plynová"
+msgstr "plyn"
msgid "heat"
msgstr "teplo (heat)"
msgid "oil"
-msgstr "ropa(oil)"
+msgstr "ropa (oil)"
msgid "sewage"
msgstr "splašky (sewage)"
@@ -18974,51 +19806,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"
+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"
@@ -19029,18 +19887,108 @@ 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 Generator"
+msgid "Power Plant"
msgstr "Elektráreň"
-msgid "Edit Power Generator"
+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 "Generátor (výroba energie)"
+
+msgid "Edit Power Generator"
+msgstr "Upraviť generátor"
+
msgid "biofuel"
msgstr "biopalivo"
@@ -19057,118 +20005,221 @@ 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 (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 "biomass / waste"
+msgstr "biomasa / odpad"
+
+msgctxt "generator method"
msgid "photovoltaic"
msgstr "fotovoltaická (solárne články)"
-msgid "pumped-storage"
-msgstr "prečerpávacia"
-
-msgid "pumping"
-msgstr "čerpacia"
-
+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 "Výstupné formy energie"
+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 "pelton_turbine"
+msgstr "Peltonova turbína"
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr "riečny tok / vodná nádrž"
+
+msgid "reciprocating_engine"
+msgstr "Piestový motor"
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr "biopalivo, bioplyn, nafta, plyn, benzín"
+
+msgid "solar_photovoltaic_panel"
+msgstr "solárny fotovoltaický panel"
+
+msgid "solar photovoltaic"
+msgstr "solárny fotovoltaický"
+
+msgid "solar_thermal_collector"
+msgstr "solárny tepelný kolektor"
+
+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 "battery charging"
-msgstr "nabíjanie batérie"
+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 "Power Station"
-msgstr "Transformátorová stanica"
+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 "Edit Power Station"
-msgstr "Upraviť trafostanicu"
+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"
@@ -19179,11 +20230,26 @@ 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"
+msgstr "Upraviť káblovú rozvodnú skriňa"
msgid "Power Tower"
msgstr "Elektrický stožiar (vysoké napätie)"
@@ -19194,8 +20260,11 @@ msgstr "Upraviť elektrický stožiar"
msgid "Tower reference"
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ť elektrický stĺp"
@@ -19212,11 +20281,9 @@ msgstr "Upraviť elektrické vedenie"
msgid "Line type"
msgstr "Typ vedenia"
-msgctxt "Power Line"
msgid "line"
msgstr "vedenie vysokého napätia (>20kV)"
-msgctxt "Power Line"
msgid "minor_line"
msgstr "vedenie nízkeho napätia (<20kV)"
@@ -19293,7 +20360,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"
@@ -19325,11 +20392,11 @@ 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ň"
@@ -19338,10 +20405,10 @@ msgid "Edit Butcher"
msgstr "Upraviť mäsiarstvo"
msgid "Seafood"
-msgstr "Morské jedlá"
+msgstr "Morské špeciality"
-msgid "Edit Seafood"
-msgstr "Upraviť morské jedlá"
+msgid "Edit Seafood Shop"
+msgstr "Upraviť obchod s morskými špecialitami"
msgid "Deli (Fine Food)"
msgstr "Špeciality"
@@ -19353,7 +20420,7 @@ msgid "Confectionery"
msgstr "Cukrovinky"
msgid "Edit Confectionery"
-msgstr "Upraviť Cukrovinky"
+msgstr "Upraviť cukrovinky"
msgid "Marketplace"
msgstr "Trhovisko"
@@ -19361,11 +20428,14 @@ 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 "Farm Stand"
msgstr "Stánok farmy"
@@ -19373,9 +20443,6 @@ msgstr "Stánok farmy"
msgid "Edit Farm Stand"
msgstr "Upraviť stánok farmy"
-msgid "Organic"
-msgstr "Biopotraviny"
-
msgid "Edit Organic/Bio"
msgstr "Upraviť bio produkty"
@@ -19392,19 +20459,19 @@ 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"
@@ -19419,7 +20486,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"
@@ -19437,22 +20504,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"
@@ -19466,14 +20533,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"
@@ -19481,9 +20548,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"
@@ -19509,17 +20575,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"
@@ -19545,10 +20617,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"
@@ -19578,8 +20671,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"
@@ -19590,20 +20683,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 "Záclony"
-msgid "Edit Curtain"
-msgstr "Upraviť záclony"
+msgid "Edit Curtain Shop"
+msgstr "Upraviť obchod so záclonami"
msgid "Frame"
msgstr "Rámy"
-msgid "Edit Frames"
-msgstr "Rámy"
+msgid "Edit Frames Shop"
+msgstr "Upraviť obchod s rámami"
msgid "Stationery"
msgstr "Papiernictvo"
@@ -19612,10 +20705,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"
@@ -19638,7 +20731,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"
@@ -19651,7 +20744,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"
@@ -19851,6 +20944,12 @@ 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"
@@ -19873,7 +20972,7 @@ msgid "Island"
msgstr "Ostrov"
msgid "Edit Island"
-msgstr "Upraviť Ostrov"
+msgstr "Upraviť ostrov"
msgid "Islet"
msgstr "Ostrovček"
@@ -19890,24 +20989,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ý"
@@ -19917,15 +21025,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"
@@ -19994,7 +21093,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"
@@ -20002,6 +21101,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"
@@ -20015,10 +21120,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"
@@ -20056,17 +21161,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"
@@ -20143,6 +21251,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"
@@ -20179,11 +21314,23 @@ 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"
@@ -20192,7 +21339,7 @@ msgid "Contact (schema with ''contact:*'' prefix)"
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"
@@ -20237,7 +21384,7 @@ msgid "Label point"
msgstr "Miesto pre menovku"
msgid "Site"
-msgstr "Areál"
+msgstr "Areál (site)"
msgid "Edit Site"
msgstr "Upraviť areál"
@@ -20306,16 +21453,16 @@ msgid "Type of enforcement"
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 "cestná kontrola "
@@ -20347,21 +21494,50 @@ msgstr "Všeobecná trasa"
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"
@@ -20407,20 +21583,23 @@ msgstr "predný bod prerušenia"
msgid "backward halt point"
msgstr "zadný bod prerušenia"
-msgid "Route network"
+msgid "Route Network"
msgstr "Sieť trás"
-msgid "Edit route network"
+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"
+msgstr ""
-msgid "Edit associated street"
-msgstr "Upraviť priradenú ulicu"
+msgid "house"
+msgstr "dom"
msgid "Street"
msgstr "Ulica"
@@ -20443,7 +21622,7 @@ msgstr "niečo vzťahujúce sa k ulici"
msgid "Destination sign"
msgstr "Smerovník"
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr "Upraviť smerovník"
msgid "Destination written on sign (w/o distance)"
@@ -20489,7 +21668,7 @@ msgid "river"
msgstr "rieka (river)"
msgid "stream"
-msgstr "potok (stream)"
+msgstr "prúd"
msgid "canal"
msgstr "prieplav"
@@ -20539,29 +21718,41 @@ msgstr "cesty prechádzajúce pod mostom"
msgid "way forming the outline footprint"
msgstr "cesta vytvárajúca celý obrys"
-msgid "nodes forming the outline"
-msgstr "body tvoriace stranu mosta"
+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é"
+msgid "bicycle"
+msgstr "pre cyklistov"
+
+msgid "foot"
+msgstr "pre peších"
+
msgid "horse"
-msgstr "pre kone (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 "poľná cesta (highway_track)"
+msgid "livingdashed"
+msgstr "doprava"
msgid "services"
msgstr "služby"
@@ -20569,11 +21760,11 @@ msgstr "služby"
msgid "ford"
msgstr "brod"
-msgid "highway_platform"
-msgstr "cestné nástupište"
+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"
@@ -20588,46 +21779,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 "lanovka tmavá"
+msgid "aeroway.dark"
+msgstr "letecké dráhy"
-msgid "aeroway_light"
-msgstr "lanovka svetlá"
+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)"
@@ -20639,28 +21833,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 "občianska vybavenosť"
+msgstr "jedlo a pitie"
-msgid "amenity_traffic"
-msgstr "občianska vybavenosť-doprava"
+msgid "amenity.traffic"
+msgstr "dopravná vybavenosť"
-msgid "amenity_light"
-msgstr "občianska vybavenosť-svetlá farba"
+msgid "amenity.light"
+msgstr "občianska vybavenosť"
-msgid "light_water"
-msgstr "voda-svetlá farba"
+msgid "light.water"
+msgstr "svetlá voda"
msgid "health"
msgstr "zdravie"
-msgid "shop"
-msgstr "obchod"
+msgid "office"
+msgstr "úrad"
msgid "hotel"
msgstr "hotel"
@@ -20734,10 +21928,13 @@ msgstr "trasa (route)"
msgid "boundary"
msgstr "hranica (boundary)"
+msgid "sport"
+msgstr "šport"
+
msgid "place"
msgstr "miesto"
-msgid "tiger_data"
+msgid "tiger.data"
msgstr "tiger dáta (USA)"
msgid "address"
@@ -20752,9 +21949,6 @@ msgstr "Dedina/Mesto"
msgid "One Way"
msgstr "Jednosmerka"
-msgid "Church"
-msgstr "Kostol"
-
msgid "Fuel Station"
msgstr "Čerpacia stanica"
@@ -20782,6 +21976,9 @@ 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 "nesprávna značka \"crossing\" na bode"
+
msgid "Unnamed unclassified highway"
msgstr "nepomenovaná neklasifikovaná cesta"
@@ -20827,11 +22024,41 @@ msgstr "nezvyčajná kombinácia značiek (highway a waterway)"
msgid "unusual tag combination (highway & natural)"
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 "značka \"natural=water\" použitá pre plavecký bazén"
-msgid "incline without highway"
-msgstr "\"incline\" bez \"highway\""
+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 "\"junction\" bez \"highway\""
@@ -20842,8 +22069,8 @@ msgstr "\"lanes\" bez \"highway\""
msgid "lcn without highway"
msgstr "\"lcn\" bez \"highway\""
-msgid "lit without highway"
-msgstr "\"lit\" bez \"highway\""
+msgid "lit without highway/railway/piste/parking/platform"
+msgstr "\"lit\" bez \"highway/railway/piste/parking/platform\""
msgid "living_street without highway"
msgstr "\"living_street\" bez \"highway\""
@@ -20860,8 +22087,8 @@ msgstr "\"motorroad\" bez \"highway\""
msgid "ntd_id without highway"
msgstr "\"ntd_id\" bez \"highway\""
-msgid "oneway without highway"
-msgstr "\"oneway\" bez \"highway\""
+msgid "oneway without highway or railway"
+msgstr "\"oneway\" bez \"highway\" alebo \"railway\""
msgid "sac_scale without highway"
msgstr "\"sac_scale\" bez \"highway\""
@@ -20977,20 +22204,131 @@ msgstr "\"canal\" bez \"waterway\""
msgid "have_riverbank without waterway"
msgstr "\"have_riverbank\" bez \"waterway\""
-msgid "tunnel without highway/railway/waterway"
-msgstr "\"tunnel\" bez \"highway/railway/waterway\""
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr "\"tunnel\" bez \"highway/railway/waterway/platform/pipeline\""
-msgid "bridge without highway/railway/waterway"
-msgstr "\"bridge\" bez \"highway/railway/waterway\""
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr "\"bridge\" bez \"highway/railway/waterway/platform/piste/pipeline\""
-msgid "psv without highway/railway/waterway"
-msgstr "\"psv\" bez \"highway/railway/waterway\""
+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"
-msgstr "\"maxspeed\" bez \"highway/railway/traffic_sign\""
+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 "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\" bez \"denomination\""
@@ -21009,9 +22347,59 @@ msgid ""
msgstr ""
"nezadaný jazyk pre wikipediu, použite \"wikipedia=jazyk:názov stránky\""
-msgid "unkown language prefix in wikipedia tag"
+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 "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"
@@ -21021,20 +22409,29 @@ msgstr "Yahoo Sat"
msgid "Bing Sat"
msgstr "Bing Sat"
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr "HDDM (Humanitný OpenStreetMap)"
+
msgid "MapBox Satellite"
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 Čiernobiely)"
-msgid "Skobbler"
-msgstr "Skobbler"
+msgid "skobbler"
+msgstr "skobbler"
+
+msgid "skobbler heatmap"
+msgstr "skobbler heatmap"
msgid "skobbler heatmap"
msgstr "skobbler heatmap"
@@ -21054,8 +22451,8 @@ msgstr "OpenStreetMap (Nemecký štýl)"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgid "2u"
-msgstr "2u"
+msgid "osmfr"
+msgstr "osmfr"
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI black-and-white 2.5m"
@@ -21063,6 +22460,9 @@ 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 (base map)"
@@ -21211,14 +22611,39 @@ 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"
+msgid "CRAIG - Moulins 2009 - 15 cm"
+msgstr "CRAIG - Moulins 2009 - 15 cm"
-msgid "Ireland Bartholomew Quarter-Inch 1940"
-msgstr "Ireland Bartholomew Quarter-Inch 1940"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgstr "CRAIG - Montluçon 2009 - 15 cm"
msgid "Ireland EEA GMES Urban Atlas"
msgstr "Ireland EEA GMES Urban Atlas"
@@ -21376,6 +22801,9 @@ 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 "New & Misaligned TIGER Roads (TIGER 2013)"
+
msgid "OSM - Tiger Edited Map"
msgstr "OSM - Tiger Edited Map"
@@ -21421,6 +22849,39 @@ msgstr "OS Scottish Popular historic"
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 "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"
@@ -21482,7 +22943,7 @@ msgid "Missing mandatory attribute ''{0}'' on <member> of relation {1}."
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''. Prijatá hodnota je \"{0}\""
+msgstr "Neplatná hodnota pre vlastnosť ''uid''. Obdržaná hodnota je \"{0}\""
msgid "nodes"
msgstr "body"
@@ -21629,6 +23090,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."
@@ -21636,13 +23109,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"
@@ -21650,14 +23123,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}''."
@@ -21681,7 +23148,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 ""
@@ -21923,8 +23390,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 "Housenumber increment:"
msgstr ""
@@ -21952,7 +23425,7 @@ msgid "Layer Properties"
msgstr "Vlastnosti vrstvy"
msgid "Error while creating image layer: {0}"
-msgstr ""
+msgstr "Chyba pri vytváraní obrazovej vrstvy: {0}"
msgid "Import image"
msgstr "Importovať obrázok"
@@ -21982,7 +23455,7 @@ 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úcu značku"
@@ -22132,8 +23605,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"
@@ -22392,7 +23865,7 @@ 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 ""
@@ -22409,17 +23882,8 @@ 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 ""
@@ -22428,7 +23892,7 @@ msgid "Advanced settings"
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."
@@ -22443,10 +23907,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:"
@@ -22455,19 +23919,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 ""
@@ -22603,6 +24067,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."
@@ -22610,7 +24077,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"
@@ -22618,15 +24085,9 @@ msgstr "25 m"
msgid "50 m"
msgstr "50 m"
-msgid "100 m"
-msgstr "100 m"
-
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
+msgid "100 m"
+msgstr "100 m"
+
msgid "symbol"
msgstr "symbol"
@@ -22684,7 +24145,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"
@@ -22773,6 +24234,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:"
@@ -22792,6 +24256,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?"
@@ -23039,8 +24506,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é."
@@ -23093,8 +24563,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ť"
@@ -23263,7 +24733,7 @@ msgid "User {0} is mapping nearby"
msgstr ""
msgid "Users mapping nearby:"
-msgstr ""
+msgstr "Používatelia mapujúci v okolí:"
msgid "Private chat"
msgstr ""
@@ -23319,27 +24789,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."
@@ -23482,31 +24934,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)"
@@ -23521,7 +24979,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)"
@@ -23536,19 +24994,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 (%)"
@@ -23563,69 +25021,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"
@@ -23634,13 +25095,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"
@@ -23649,51 +25110,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 "
@@ -23723,11 +25186,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"
@@ -24438,14 +25904,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."
@@ -24461,7 +25952,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 "
@@ -24575,7 +26066,7 @@ msgid "The username and password is protected by {0}."
msgstr ""
msgid "username"
-msgstr ""
+msgstr "meno používateľa"
msgid "password"
msgstr ""
@@ -24607,7 +26098,7 @@ msgid "Use {0}"
msgstr ""
msgid "Encrypt data with Windows logon credentials"
-msgstr "Zakódovať údaje s prihlasovacími údajmi Windows"
+msgstr "Zašifrovať údaje s prihlasovacími údajmi Windows"
msgid "The native password manager plugin detected {0} on your system."
msgstr ""
@@ -24663,7 +26154,7 @@ msgid "Zip Files"
msgstr "zip súbory"
msgid "7Zip Files"
-msgstr ""
+msgstr "7Zip súbory"
msgid "OpenData XML files"
msgstr "OpenData XML súbory"
@@ -24729,7 +26220,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"
@@ -25063,7 +26554,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"
@@ -25093,9 +26584,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 "Process queue"
msgstr "Proces poradia"
@@ -25152,18 +26640,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 ""
@@ -25511,6 +26987,27 @@ 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 "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 ""
@@ -25662,6 +27159,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 ""
@@ -25902,7 +27403,7 @@ msgid "[gap]"
msgstr ""
msgid " [ID] {0}"
-msgstr ""
+msgstr " [ID] {0}"
msgid "Route patterns ..."
msgstr "Vzory trás"
@@ -25979,9 +27480,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr "Stopy"
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -26177,13 +27675,13 @@ msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
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"
@@ -26192,10 +27690,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}"
@@ -26204,33 +27705,53 @@ 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 ""
+"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)"
@@ -26238,6 +27759,9 @@ msgstr "Plugin Dopravné značky (Road Sign Plugin)"
msgid "signs"
msgstr "dopravné značky"
+msgid "Change Properties"
+msgstr "Zmeniť vlastnosti"
+
msgid "Country preset:"
msgstr "Prednastavenie krajiny:"
@@ -26344,7 +27868,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"
@@ -26352,9 +27876,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)"
@@ -26533,19 +28054,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"
@@ -26688,7 +28209,7 @@ msgid "Street name: "
msgstr "Názov ulice: "
msgid "Building: "
-msgstr ""
+msgstr "Budova: "
msgid "Even/Odd"
msgstr "Párne/Nepárne"
@@ -26736,7 +28257,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 "
@@ -26765,6 +28286,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"
@@ -26801,6 +28411,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..."
@@ -26819,7 +28433,7 @@ msgid "Signed"
msgstr ""
msgid "Unknown"
-msgstr ""
+msgstr "Neznámy"
msgid "Object signatures"
msgstr ""
@@ -26953,9 +28567,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -27144,7 +28755,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"
@@ -27199,7 +28810,14 @@ 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 "
@@ -27453,8 +29071,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> "
@@ -27462,18 +29080,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"
@@ -27481,7 +29103,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 "
@@ -27502,6 +29124,11 @@ 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"
@@ -27543,7 +29170,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 "
@@ -27659,7 +29286,7 @@ msgstr "Obnoviť Objekt"
msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
"w2''"
-msgstr ""
+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"
@@ -27677,7 +29304,7 @@ 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"
@@ -28028,9 +29655,6 @@ msgstr "Odznačiť body"
msgid "Removes all nodes from selection"
msgstr "Odstráni všetky body z výberu"
-msgid "Video"
-msgstr "Video"
-
msgid "Import Video"
msgstr "Importovať video"
@@ -28053,7 +29677,7 @@ msgid "Video: {0}"
msgstr "Video: {0}"
msgid "Backward"
-msgstr ""
+msgstr "Späť"
msgid "jumps n sec back"
msgstr "skočí n sekúnd späť"
@@ -28080,19 +29704,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"
@@ -28107,7 +29731,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"
@@ -28261,7 +29885,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"
@@ -28278,19 +29902,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"
@@ -28302,13 +29926,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"
@@ -28317,19 +29941,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ť značku"
-
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"
+"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 2df3e7d..f6ee9fc 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-08-04 03:41+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-08-05 04:59+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -60,6 +63,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -160,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 ""
@@ -251,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"
@@ -290,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}"
@@ -346,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"
@@ -538,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 ""
@@ -651,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 ""
@@ -801,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"
@@ -989,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 ""
@@ -1012,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>"
@@ -1180,9 +1180,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1328,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"
@@ -1423,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"
@@ -1707,6 +1725,9 @@ 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})"
@@ -1928,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] ""
@@ -2354,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 ""
@@ -2550,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 ""
@@ -2637,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 ""
@@ -2673,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"
@@ -2701,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}''"
@@ -2806,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] ""
@@ -2866,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"
@@ -2897,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 ""
@@ -2921,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 ""
@@ -2951,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 ""
@@ -2971,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 ""
@@ -2980,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 ""
@@ -3000,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}"
@@ -3031,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}''."
@@ -3194,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 ""
@@ -3302,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 ""
@@ -3340,9 +3368,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3383,6 +3408,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Naslovi"
@@ -3407,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 ""
@@ -3466,6 +3503,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Podvojena vozlišča"
@@ -3548,6 +3588,15 @@ 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 ""
@@ -3617,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 ""
@@ -3674,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})"
@@ -3712,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}"
@@ -3849,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 ""
@@ -3924,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 ""
@@ -3954,9 +4012,6 @@ msgstr "zgradba"
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3981,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''"
@@ -4047,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 ""
@@ -4171,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"
@@ -4400,6 +4438,18 @@ 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"
@@ -4504,19 +4554,6 @@ 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 ""
-"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 ""
@@ -4804,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"
@@ -4841,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"
@@ -4893,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"
@@ -5150,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 ""
@@ -5678,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 ""
@@ -5761,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"
@@ -5851,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 ""
@@ -6022,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 ""
@@ -6309,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"
@@ -6375,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"
@@ -6417,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)"
@@ -6581,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"
@@ -6899,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"
@@ -7032,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, "
@@ -7058,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 ""
@@ -7176,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."
@@ -7275,6 +7350,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7362,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"
@@ -7381,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 ""
@@ -7447,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"
@@ -7523,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 ""
@@ -7538,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"
@@ -7754,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 "
@@ -7768,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 ""
@@ -7783,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 ""
@@ -7790,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 ..."
@@ -7903,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] ""
@@ -7915,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>"
@@ -7931,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:"
@@ -8077,7 +8184,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8107,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"
@@ -8460,9 +8567,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8481,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"
@@ -8538,6 +8645,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8610,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 ""
@@ -8793,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}''..."
@@ -8815,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"
@@ -8825,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:"
@@ -9046,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}''"
@@ -9761,6 +9866,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9829,6 +9967,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 ""
@@ -9882,6 +10023,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 ""
@@ -10340,6 +10486,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 ""
@@ -10403,8 +10555,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"
@@ -10661,40 +10813,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}''"
@@ -10747,8 +10899,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:"
@@ -10757,20 +10909,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 ""
@@ -10852,14 +11009,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"
@@ -10934,6 +11085,9 @@ msgstr "Uporabi prednastavitev"
msgid "New relation"
msgstr ""
+msgid "Change Tags"
+msgstr ""
+
msgid "Change Properties"
msgstr "Spremeni lastnosti"
@@ -11013,9 +11167,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr "Vira prednastavitev ni bilo mogoče prebrati: {0}"
-
msgid "Error parsing {0}: "
msgstr ""
@@ -11034,6 +11185,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 ""
@@ -11063,9 +11222,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 ""
@@ -11096,7 +11295,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 ""
@@ -11136,28 +11335,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..."
@@ -11256,6 +11453,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11271,12 +11471,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}."
@@ -11355,7 +11563,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11454,35 +11662,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 ""
@@ -11492,8 +11676,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 ..."
@@ -11520,10 +11704,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>"
@@ -11607,8 +11788,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}."
@@ -11807,7 +11988,7 @@ 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}"
@@ -11853,6 +12034,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."
@@ -11883,19 +12073,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 ""
@@ -11917,11 +12107,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 ""
@@ -11991,13 +12193,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}''"
@@ -12140,10 +12342,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"
@@ -12158,22 +12360,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}''"
@@ -12246,8 +12447,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..."
@@ -12262,26 +12462,41 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
-msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+msgid "Plugin list download error"
msgstr ""
-msgid "Writing plugin list to local cache ''{0}''"
+msgid "JOSM failed to download plugin list:"
msgstr ""
-msgid "Parsing plugin list from site ''{0}''"
+msgid "Details:"
msgstr ""
-msgid ""
-"Failed to parse plugin list document from site ''{0}''. Skipping site. "
-"Exception was: {1}"
+msgid "Plugin icons download error"
msgstr ""
-msgid "Processing plugin list from site ''{0}''"
+msgid "JOSM failed to download plugin icons:"
msgstr ""
-msgid "This is after the end of the recording"
+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 ""
+
+msgid "Parsing plugin list from site ''{0}''"
+msgstr ""
+
+msgid ""
+"Failed to parse plugin list document from site ''{0}''. Skipping site. "
+"Exception was: {1}"
+msgstr ""
+
+msgid "Processing plugin list from site ''{0}''"
+msgstr ""
+
+msgid "This is after the end of the recording"
msgstr ""
msgid "unspecified reason"
@@ -12586,12 +12801,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12602,9 +12816,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 ""
@@ -12636,9 +12893,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."
@@ -12961,6 +13232,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 ""
@@ -13200,6 +13476,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."
@@ -13249,9 +13528,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 ""
@@ -13288,6 +13564,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 ""
@@ -13418,6 +13699,9 @@ msgstr "Nasip"
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "Cestnina"
+
msgid "Motorway Link"
msgstr "Avtocestni priključek"
@@ -13508,6 +13792,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 ""
@@ -13526,10 +13854,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13541,6 +13869,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13568,18 +13899,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)"
@@ -13589,9 +13914,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13601,13 +13923,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13655,6 +13977,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Najnižja hitrost (km/h)"
@@ -13739,6 +14064,9 @@ msgstr "Uredi most"
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13843,21 +14171,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 ""
@@ -13873,10 +14210,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"
@@ -13912,7 +14249,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13981,12 +14318,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 ""
@@ -14002,15 +14345,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 ""
@@ -14032,6 +14366,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr "Stop znak"
@@ -14041,6 +14384,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -14050,10 +14396,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14086,9 +14429,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr "Obračališče"
@@ -14131,6 +14471,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr "Stebriček"
@@ -14146,6 +14492,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14215,19 +14564,16 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
-msgstr ""
-
-msgid "split_rail"
+msgid "pole"
msgstr ""
-msgid "chain"
+msgid "Guard Rail"
msgstr ""
-msgid "hedge"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14258,6 +14604,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14267,10 +14614,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14324,12 +14671,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14390,12 +14731,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr "Potok"
msgid "Edit Stream"
msgstr "Uredi potok"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Kanal"
@@ -14435,9 +14785,6 @@ msgstr "Uredi jez"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14471,6 +14818,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"
@@ -14552,18 +14914,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 ""
@@ -14639,7 +15006,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14663,10 +15030,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"
@@ -14678,9 +15048,6 @@ msgstr "Tir ozkotirne železnice"
msgid "Edit Narrow Gauge Rail"
msgstr "Uredi tir ozkotirne železnice"
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14732,6 +15099,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14744,18 +15114,32 @@ 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 ""
@@ -14855,11 +15239,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14871,11 +15253,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14894,12 +15274,12 @@ msgstr ""
msgid "underground"
msgstr ""
+msgid "rooftop"
+msgstr ""
+
msgid "Access"
msgstr "Dostop"
-msgid "customers"
-msgstr ""
-
msgid "Park and Ride"
msgstr ""
@@ -14927,9 +15307,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14951,10 +15328,29 @@ 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"
@@ -15104,6 +15500,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15125,6 +15524,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15152,10 +15557,16 @@ msgstr "Izposojevalnica"
msgid "Edit Car Rental"
msgstr "Uredi izposojevalnico avtomobilov"
-msgid "Sharing"
+msgid "Second hand"
msgstr ""
-msgid "Edit Car Sharing"
+msgid "only"
+msgstr ""
+
+msgid "Sharing"
+msgstr ""
+
+msgid "Edit Car Sharing"
msgstr ""
msgid "Edit Motorcycle Parking"
@@ -15176,22 +15587,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 ""
@@ -15213,9 +15608,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15410,6 +15802,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15440,6 +15835,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Klopca"
@@ -15452,9 +15850,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15464,9 +15859,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr "Zgradba"
@@ -15479,6 +15879,9 @@ msgstr "Uredi vhod v podzemno"
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15503,14 +15906,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15559,8 +15954,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"
@@ -15613,41 +16008,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"
@@ -15839,9 +16234,6 @@ msgstr ""
msgid "Edit Stripclub"
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 "Tourism"
msgstr "Turizem"
@@ -15863,9 +16255,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Zemljevid"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15878,6 +16276,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15917,6 +16318,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15938,22 +16342,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"
@@ -16083,49 +16499,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"
@@ -16143,6 +16553,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16155,6 +16571,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16173,37 +16592,137 @@ 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"
@@ -16293,6 +16812,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"
@@ -16374,12 +16899,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+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"
@@ -16389,6 +16968,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 ""
@@ -16398,31 +17001,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 ""
@@ -16450,8 +17059,8 @@ msgstr ""
msgid "Recycling"
msgstr "Recikliranje"
-msgid "Edit Recycling station"
-msgstr "Uredi raciklažno točko"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr ""
@@ -16477,21 +17086,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 "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16526,18 +17129,24 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
+
msgid "Hide"
msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
-msgstr "Pitna voda"
-
msgid "Edit Source of Potable Water"
msgstr ""
@@ -16569,6 +17178,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16606,119 +17218,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"
@@ -16750,26 +17398,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 ""
@@ -16777,6 +17426,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr "stadion"
+
msgid "10pin"
msgstr ""
@@ -16810,6 +17468,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr "Uredi kolesarjenje"
+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 "Pasje dirke"
@@ -16866,7 +17540,7 @@ msgid "Skating"
msgstr "Drsanje"
msgid "Edit Skating"
-msgstr "Uredi Drsanje"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -16910,36 +17584,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 ""
@@ -16982,19 +17674,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 ""
@@ -17133,6 +17821,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 ""
@@ -17145,58 +17845,132 @@ 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"
-msgid "apartments"
+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 ""
-msgid "house"
+msgctxt "entrance"
+msgid "main"
msgstr ""
-msgid "hut"
+msgctxt "entrance"
+msgid "service"
msgstr ""
-msgid "terrace"
+msgctxt "entrance"
+msgid "exit"
msgstr ""
-msgid "detached"
+msgctxt "entrance"
+msgid "emergency"
msgstr ""
msgid "Tower"
@@ -17423,41 +18197,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"
@@ -17466,8 +18266,8 @@ msgstr "Geodetska točka"
msgid "Edit Survey Point"
msgstr "Uredi geodetsko točko"
-msgid "Surveillance"
-msgstr "Video nadzor"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Uredi video nadzorno kamero"
@@ -17478,12 +18278,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 ""
@@ -17535,88 +18425,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 "battery charging"
+msgid "hygro run-of-the-river / hydro water-storage"
msgstr ""
-msgid "Power Station"
+msgid "reciprocating_engine"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17628,6 +18621,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 ""
@@ -17643,6 +18651,9 @@ msgstr "Uredi steber daljnovoda"
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17661,11 +18672,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17774,11 +18783,11 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
-msgstr "Pekarna"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Uredi pekarno"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Mesar"
@@ -17789,7 +18798,7 @@ msgstr "Uredi mesarja"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17810,6 +18819,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17822,9 +18834,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17894,7 +18903,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17915,13 +18924,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"
@@ -17930,7 +18939,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17958,6 +18966,12 @@ msgstr "Uredi menjalnico"
msgid "Edit Automated Teller Machine"
msgstr "Uredi bankomat"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17994,10 +19008,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"
@@ -18027,7 +19062,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18039,19 +19074,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"
@@ -18087,7 +19122,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18300,6 +19335,12 @@ msgstr "Vrh"
msgid "Edit Peak"
msgstr "Uredi vrh"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18339,24 +19380,33 @@ msgstr "Drevo"
msgid "Edit Tree"
msgstr "Uredi drevo"
+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 ""
@@ -18366,15 +19416,6 @@ msgstr "Gozd"
msgid "Edit Forest Landuse"
msgstr "Uredi gozdnata tla"
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18450,6 +19491,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Vinograd"
@@ -18504,7 +19551,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18516,6 +19563,9 @@ msgstr "Pokopališče"
msgid "Edit Graveyard"
msgstr "Uredi pokopališče"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18591,6 +19641,33 @@ msgstr "Uredi kamnolom"
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 "Urejanje podatkov o naslovu"
@@ -18627,6 +19704,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18795,21 +19884,50 @@ 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 ""
+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 ""
@@ -18855,19 +19973,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"
@@ -18891,7 +20012,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18987,18 +20108,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 ""
@@ -19008,7 +20138,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -19017,10 +20150,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -19038,6 +20171,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19053,28 +20189,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"
@@ -19095,19 +20231,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"
@@ -19182,10 +20318,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr "šport"
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19200,9 +20339,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19230,6 +20366,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19275,10 +20414,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"
@@ -19290,7 +20459,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"
@@ -19308,7 +20477,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19425,19 +20594,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 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"
@@ -19456,7 +20736,46 @@ 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 "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 "Landsat"
@@ -19468,19 +20787,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 "skobbler heatmap"
@@ -19501,7 +20829,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19510,6 +20838,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19656,6 +20987,29 @@ 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 ""
@@ -19821,6 +21175,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19866,6 +21223,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr "izbriši podatke po uvozu"
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -20058,13 +21448,25 @@ msgstr "Ni obveznega opisa. Prosimo, vpišite opis sledi."
msgid "Uploading GPX Track"
msgstr "Pošiljanje sledi GPX"
-msgid "Uploads traces to openstreetmap.org"
-msgstr "Pošlji sledi na openstreetmap.org"
+msgid "Uploads traces to openstreetmap.org"
+msgstr "Pošlji sledi na openstreetmap.org"
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
+msgstr ""
+
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20088,13 +21490,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20357,10 +21753,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20564,7 +21963,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"
@@ -20835,15 +22234,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -21014,6 +22404,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 ""
@@ -21032,12 +22425,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21173,6 +22560,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 ""
@@ -21190,6 +22580,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 ""
@@ -21416,7 +22809,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."
@@ -21466,7 +22862,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21651,6 +23047,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21690,27 +23151,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 ""
@@ -22790,9 +24233,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 ""
@@ -23439,9 +24899,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23494,18 +24951,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 ""
@@ -23852,6 +25297,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -24003,6 +25469,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 ""
@@ -24320,9 +25789,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24538,6 +26004,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 ""
@@ -24570,15 +26039,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 ""
@@ -24693,9 +26178,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24874,19 +26356,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"
@@ -25102,6 +26584,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 ""
@@ -25138,6 +26709,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..."
@@ -25290,9 +26864,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26280,9 +27851,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26561,9 +28129,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 45ad6ad..1f6329c 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-08-04 03:41+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-08-05 04:32+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 ""
@@ -250,9 +256,6 @@ msgstr "Vegla: {0}"
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -289,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -343,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 ""
@@ -523,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -636,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 ""
@@ -786,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"
@@ -972,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 ""
@@ -995,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>"
@@ -1163,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1304,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"
@@ -1399,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 ""
@@ -1683,6 +1703,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1902,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] ""
@@ -2328,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 ""
@@ -2524,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 ""
@@ -2611,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 ""
@@ -2647,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"
@@ -2673,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}''"
@@ -2778,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] ""
@@ -2838,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"
@@ -2869,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"
@@ -2893,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 ""
@@ -2923,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 ""
@@ -2943,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 ""
@@ -2952,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 ""
@@ -2972,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}"
@@ -3003,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}''."
@@ -3160,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 ""
@@ -3268,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 ""
@@ -3306,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3347,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3371,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 ""
@@ -3430,6 +3469,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3512,6 +3554,15 @@ 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 ""
@@ -3581,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 ""
@@ -3638,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})"
@@ -3676,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}"
@@ -3813,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"
@@ -3888,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 ""
@@ -3918,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3945,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''"
@@ -4011,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 ""
@@ -4131,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"
@@ -4360,6 +4400,18 @@ 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 ""
@@ -4464,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 ""
@@ -4764,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"
@@ -4801,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"
@@ -4853,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 ""
@@ -5110,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 ""
@@ -5638,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5721,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 ""
@@ -5811,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 ""
@@ -5982,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 ""
@@ -6269,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"
@@ -6335,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"
@@ -6377,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)"
@@ -6537,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"
@@ -6855,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 ""
@@ -6986,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 ""
@@ -7010,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 ""
@@ -7123,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."
@@ -7222,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7309,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"
@@ -7328,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 ""
@@ -7394,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"
@@ -7470,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 ""
@@ -7485,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"
@@ -7701,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 "
@@ -7715,13 +7795,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7730,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 ""
@@ -7737,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 ..."
@@ -7850,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] ""
@@ -7862,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>"
@@ -7878,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:"
@@ -8024,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8054,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"
@@ -8407,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8428,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 ""
@@ -8485,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8551,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 ""
@@ -8734,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}''..."
@@ -8756,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"
@@ -8766,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:"
@@ -8987,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}''"
@@ -9702,6 +9811,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9770,6 +9912,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9823,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 ""
@@ -10279,6 +10429,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 ""
@@ -10342,7 +10498,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 ""
@@ -10600,40 +10756,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}''"
@@ -10686,8 +10842,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:"
@@ -10696,20 +10852,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 ""
@@ -10791,14 +10952,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,7 +11026,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10950,9 +11105,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10971,6 +11123,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 ""
@@ -11000,9 +11160,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 ""
@@ -11033,7 +11233,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 ""
@@ -11073,28 +11273,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..."
@@ -11189,6 +11387,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11204,12 +11405,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}."
@@ -11288,7 +11497,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11387,35 +11596,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 ""
@@ -11425,8 +11610,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 ..."
@@ -11453,10 +11638,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>"
@@ -11540,8 +11722,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}."
@@ -11738,7 +11920,7 @@ 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}"
@@ -11784,6 +11966,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."
@@ -11814,19 +12005,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 ""
@@ -11848,11 +12039,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 ""
@@ -11922,13 +12125,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}''"
@@ -12071,10 +12274,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"
@@ -12089,22 +12292,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}''"
@@ -12173,8 +12375,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..."
@@ -12189,9 +12390,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}''"
@@ -12513,12 +12729,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12529,30 +12744,73 @@ 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 "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] ""
+
+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"
@@ -12563,9 +12821,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."
@@ -12888,6 +13160,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 ""
@@ -13127,6 +13404,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."
@@ -13176,9 +13456,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 ""
@@ -13215,6 +13492,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 ""
@@ -13345,6 +13627,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13435,6 +13720,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 ""
@@ -13453,10 +13782,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 +13797,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13495,18 +13827,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 ""
@@ -13516,9 +13842,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13528,13 +13851,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13582,6 +13905,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13666,6 +13992,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13770,21 +14099,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 ""
@@ -13800,10 +14138,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"
@@ -13839,7 +14177,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13908,12 +14246,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 ""
@@ -13929,15 +14273,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 ""
@@ -13959,6 +14294,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13968,6 +14312,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13977,10 +14324,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14013,9 +14357,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14058,6 +14399,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14073,6 +14420,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14142,19 +14492,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14185,6 +14529,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14194,10 +14539,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14251,12 +14596,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14317,12 +14656,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14362,9 +14710,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14398,6 +14743,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 ""
@@ -14479,18 +14839,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 ""
@@ -14566,7 +14931,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14590,10 +14955,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"
@@ -14605,9 +14973,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14659,6 +15024,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14671,6 +15039,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14782,11 +15185,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14798,11 +15199,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14821,10 +15220,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14854,9 +15253,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14878,10 +15274,29 @@ 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"
@@ -15031,6 +15446,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15052,6 +15470,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15079,6 +15503,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15103,22 +15533,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 ""
@@ -15140,9 +15554,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15337,6 +15748,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15367,6 +15781,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15379,9 +15796,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15391,9 +15805,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15406,6 +15825,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15430,14 +15852,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15486,7 +15900,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15540,41 +15954,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"
@@ -15766,9 +16180,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15790,9 +16201,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15805,6 +16222,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15844,6 +16264,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15865,22 +16288,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"
@@ -16010,49 +16445,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"
@@ -16070,6 +16499,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16082,6 +16517,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16100,37 +16538,137 @@ 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"
@@ -16220,6 +16758,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"
@@ -16301,128 +16845,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16453,16 +17075,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16496,6 +17124,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16533,117 +17164,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 ""
@@ -16677,33 +17344,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 ""
@@ -16737,6 +17414,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 ""
@@ -16837,36 +17530,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 ""
@@ -16909,19 +17620,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 ""
@@ -17060,6 +17767,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 ""
@@ -17072,60 +17791,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 ""
@@ -17350,41 +18143,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"
@@ -17393,7 +18212,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17405,12 +18224,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 ""
@@ -17462,88 +18371,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17555,6 +18567,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 ""
@@ -17570,6 +18597,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17588,11 +18618,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17701,10 +18729,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17716,7 +18744,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17737,6 +18765,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17749,9 +18780,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17821,7 +18849,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17842,13 +18870,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"
@@ -17857,7 +18885,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17885,6 +18912,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17921,10 +18954,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"
@@ -17954,7 +19008,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17966,19 +19020,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"
@@ -18014,7 +19068,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18227,6 +19281,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18266,24 +19326,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 ""
@@ -18293,15 +19362,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18377,6 +19437,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18431,7 +19497,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18443,6 +19509,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18479,43 +19548,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18554,6 +19650,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18722,21 +19830,50 @@ 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 ""
+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 ""
@@ -18782,19 +19919,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"
@@ -18818,7 +19958,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18914,18 +20054,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 ""
@@ -18935,7 +20084,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18944,10 +20096,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18965,6 +20117,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18980,28 +20135,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"
@@ -19022,19 +20177,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"
@@ -19109,10 +20264,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19127,9 +20285,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19157,6 +20312,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19202,10 +20360,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"
@@ -19217,7 +20405,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"
@@ -19235,7 +20423,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19352,19 +20540,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 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"
@@ -19383,7 +20682,46 @@ 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 "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 "Landsat"
@@ -19395,19 +20733,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 "skobbler heatmap"
@@ -19428,7 +20775,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19437,6 +20784,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19583,6 +20933,29 @@ 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 ""
@@ -19748,6 +21121,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19793,6 +21169,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19979,19 +21388,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20015,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}''."
@@ -20284,10 +21699,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20491,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"
@@ -20762,15 +22180,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20941,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 ""
@@ -20959,12 +22371,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21100,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 ""
@@ -21117,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 ""
@@ -21343,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."
@@ -21393,7 +22808,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21578,6 +22993,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21617,27 +23097,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 ""
@@ -22715,9 +24177,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 ""
@@ -23364,9 +24843,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23419,18 +24895,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 ""
@@ -23777,6 +25241,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23928,6 +25413,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 ""
@@ -24245,9 +25733,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24463,6 +25948,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 ""
@@ -24495,15 +25983,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 ""
@@ -24618,9 +26122,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24799,19 +26300,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"
@@ -25027,6 +26528,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 ""
@@ -25063,6 +26653,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..."
@@ -25215,9 +26808,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26203,9 +27793,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26484,9 +28071,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 9dd5460..f307f34 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-08-04 03:41+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-08-05 04:58+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr "Услови коришћења позадине"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -60,6 +63,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -163,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 ""
@@ -254,9 +260,6 @@ msgstr "Алатка: {0}"
msgid "Please select at least four nodes."
msgstr "Изаберите најмање четири тачке."
-msgid "Information"
-msgstr "Обавештење"
-
msgid "Align Nodes in Line"
msgstr "Поређај тачке у линију"
@@ -293,6 +296,9 @@ msgstr "следеће"
msgid "Nothing selected to zoom to."
msgstr "Ниеј изабрани ништа што треба приказати."
+msgid "Information"
+msgstr "Обавештење"
+
msgid "Zoom to {0}"
msgstr ""
@@ -347,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 ""
@@ -527,6 +533,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -640,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 ""
@@ -790,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"
@@ -976,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 ""
@@ -999,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>"
@@ -1167,9 +1169,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1308,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"
@@ -1403,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 ""
@@ -1687,6 +1707,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1906,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] ""
@@ -2332,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 ""
@@ -2528,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 ""
@@ -2615,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 ""
@@ -2651,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"
@@ -2677,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}''"
@@ -2782,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] ""
@@ -2842,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"
@@ -2873,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"
@@ -2897,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 ""
@@ -2927,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 ""
@@ -2947,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 ""
@@ -2956,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 ""
@@ -2976,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}"
@@ -3007,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}''."
@@ -3164,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 ""
@@ -3272,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 ""
@@ -3310,9 +3340,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3351,6 +3378,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3375,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 ""
@@ -3434,6 +3473,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3516,6 +3558,15 @@ 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 ""
@@ -3585,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 ""
@@ -3642,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})"
@@ -3680,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}"
@@ -3817,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"
@@ -3892,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 ""
@@ -3922,9 +3982,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3949,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''"
@@ -4015,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 ""
@@ -4135,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"
@@ -4364,6 +4404,18 @@ 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 ""
@@ -4468,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 ""
@@ -4768,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"
@@ -4805,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"
@@ -4857,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 ""
@@ -5114,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 ""
@@ -5642,6 +5691,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5725,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 ""
@@ -5815,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 ""
@@ -5986,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 ""
@@ -6273,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"
@@ -6339,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"
@@ -6381,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)"
@@ -6541,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"
@@ -6859,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 ""
@@ -6990,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 ""
@@ -7014,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 ""
@@ -7127,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."
@@ -7227,6 +7306,9 @@ msgid ""
msgstr ""
"<html>Верзија <strong>{0}</strong> направљена <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7314,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"
@@ -7333,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 ""
@@ -7399,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"
@@ -7475,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 ""
@@ -7490,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"
@@ -7706,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 "
@@ -7720,13 +7800,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7735,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 ""
@@ -7742,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 ..."
@@ -7855,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] ""
@@ -7867,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>"
@@ -7883,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:"
@@ -8029,7 +8140,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8059,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"
@@ -8412,9 +8523,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8433,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 ""
@@ -8490,6 +8601,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8556,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 ""
@@ -8739,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}''..."
@@ -8761,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"
@@ -8771,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:"
@@ -8992,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}''"
@@ -9707,6 +9816,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9775,6 +9917,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9828,6 +9973,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 ""
@@ -10284,6 +10434,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 ""
@@ -10347,7 +10503,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 ""
@@ -10605,40 +10761,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}''"
@@ -10691,8 +10847,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:"
@@ -10701,20 +10857,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 ""
@@ -10796,14 +10957,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"
@@ -10876,7 +11031,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10955,9 +11110,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10976,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 ""
@@ -11005,9 +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 ""
@@ -11038,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 ""
@@ -11078,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..."
@@ -11194,6 +11392,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11209,12 +11410,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}."
@@ -11293,7 +11502,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11392,35 +11601,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 ""
@@ -11430,8 +11615,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 ..."
@@ -11458,10 +11643,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>"
@@ -11545,8 +11727,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}."
@@ -11743,7 +11925,7 @@ 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}"
@@ -11789,6 +11971,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."
@@ -11819,19 +12010,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 ""
@@ -11853,11 +12044,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 ""
@@ -11927,13 +12130,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}''"
@@ -12076,10 +12279,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"
@@ -12094,22 +12297,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}''"
@@ -12178,8 +12380,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..."
@@ -12194,9 +12395,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}''"
@@ -12518,12 +12734,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12534,30 +12749,73 @@ 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 "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] ""
+
+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"
@@ -12568,9 +12826,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."
@@ -12893,6 +13165,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 ""
@@ -13132,6 +13409,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."
@@ -13181,9 +13461,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 ""
@@ -13220,6 +13497,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 ""
@@ -13350,6 +13632,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13440,6 +13725,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 ""
@@ -13458,10 +13787,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13473,6 +13802,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13500,18 +13832,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 ""
@@ -13521,9 +13847,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13533,13 +13856,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13587,6 +13910,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13671,6 +13997,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13775,21 +14104,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 ""
@@ -13805,10 +14143,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"
@@ -13844,7 +14182,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13913,12 +14251,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 ""
@@ -13934,15 +14278,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 ""
@@ -13964,6 +14299,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13973,6 +14317,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13982,10 +14329,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14018,9 +14362,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14063,6 +14404,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14078,6 +14425,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14147,19 +14497,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14190,6 +14534,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14199,10 +14544,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14256,12 +14601,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14322,12 +14661,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14367,9 +14715,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14403,6 +14748,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 ""
@@ -14484,18 +14844,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 ""
@@ -14571,7 +14936,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14595,10 +14960,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"
@@ -14610,9 +14978,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14664,6 +15029,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14676,6 +15044,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14787,11 +15190,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14803,11 +15204,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14826,10 +15225,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14859,9 +15258,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14883,10 +15279,29 @@ 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"
@@ -15036,6 +15451,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15057,6 +15475,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15084,6 +15508,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15108,22 +15538,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 ""
@@ -15145,9 +15559,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15342,6 +15753,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15372,6 +15786,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15384,9 +15801,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15396,9 +15810,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15411,6 +15830,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15435,14 +15857,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15491,7 +15905,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15545,41 +15959,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"
@@ -15771,9 +16185,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15795,9 +16206,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15810,6 +16227,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15849,6 +16269,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15870,22 +16293,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,49 +16450,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"
@@ -16075,6 +16504,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16087,6 +16522,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16105,37 +16543,137 @@ 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"
@@ -16225,6 +16763,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 ""
@@ -16306,128 +16850,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16458,16 +17080,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16501,6 +17129,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16538,117 +17169,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 ""
@@ -16682,33 +17349,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 ""
@@ -16742,6 +17419,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 ""
@@ -16842,36 +17535,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 ""
@@ -16914,19 +17625,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 ""
@@ -17065,6 +17772,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 ""
@@ -17077,60 +17796,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 ""
@@ -17355,41 +18148,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"
@@ -17398,7 +18217,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17410,12 +18229,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 ""
@@ -17467,88 +18376,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17560,6 +18572,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 ""
@@ -17575,6 +18602,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17593,11 +18623,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17706,10 +18734,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17721,7 +18749,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17742,6 +18770,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17754,9 +18785,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17826,7 +18854,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17847,13 +18875,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"
@@ -17862,7 +18890,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17890,6 +18917,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17926,10 +18959,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"
@@ -17959,7 +19013,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17971,19 +19025,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"
@@ -18019,7 +19073,7 @@ msgstr "Измени туристичку агенцију"
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18232,6 +19286,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18271,24 +19331,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 ""
@@ -18298,15 +19367,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18382,6 +19442,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18436,7 +19502,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18448,6 +19514,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18484,43 +19553,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18559,6 +19655,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18727,21 +19835,50 @@ 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 ""
+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 ""
@@ -18787,19 +19924,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"
@@ -18823,7 +19963,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18919,18 +20059,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 ""
@@ -18940,7 +20089,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18949,10 +20101,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18970,6 +20122,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18985,28 +20140,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"
@@ -19027,19 +20182,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"
@@ -19114,10 +20269,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19132,9 +20290,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19162,6 +20317,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19207,10 +20365,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"
@@ -19222,7 +20410,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"
@@ -19240,7 +20428,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19357,19 +20545,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 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"
@@ -19388,7 +20687,46 @@ 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 "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 "Landsat"
@@ -19400,19 +20738,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 "skobbler heatmap"
@@ -19433,7 +20780,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19442,6 +20789,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19588,6 +20938,29 @@ 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 ""
@@ -19753,6 +21126,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19798,6 +21174,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19984,19 +21393,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20020,13 +21441,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20289,10 +21704,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20496,7 +21914,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"
@@ -20767,15 +22185,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20946,6 +22355,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 ""
@@ -20964,12 +22376,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21105,6 +22511,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 ""
@@ -21122,6 +22531,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 ""
@@ -21348,7 +22760,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."
@@ -21398,7 +22813,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21583,6 +22998,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21622,27 +23102,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 ""
@@ -22720,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 ""
@@ -23369,9 +24848,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23424,18 +24900,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 ""
@@ -23782,6 +25246,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23933,6 +25418,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 ""
@@ -24250,9 +25738,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24468,6 +25953,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 ""
@@ -24500,15 +25988,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 ""
@@ -24623,9 +26127,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24804,19 +26305,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"
@@ -25032,6 +26533,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 ""
@@ -25068,6 +26658,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..."
@@ -25220,9 +26813,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26208,9 +27798,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26489,9 +28076,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 15217e6..c711953 100644
--- a/i18n/po/sv.po
+++ b/i18n/po/sv.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-07-15 14:32+0000\n"
-"Last-Translator: Niklas Henriksson <fringillus92 at gmail.com>\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-08-05 05:00+0000\n"
-"X-Generator: Launchpad (build 16718)\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"
@@ -50,6 +50,9 @@ 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}"
@@ -59,6 +62,9 @@ msgstr "INFO: {0}"
msgid "DEBUG: {0}"
msgstr "DEBUG: {0}"
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Kör plattformens uppstarts-hook"
@@ -162,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 "
@@ -262,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"
@@ -301,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}"
@@ -357,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"
@@ -545,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)"
@@ -666,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"
@@ -833,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"
@@ -1038,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 "
@@ -1066,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>"
@@ -1248,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"
@@ -1400,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"
@@ -1515,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"
@@ -1808,6 +1813,9 @@ 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)"
msgstr "Hämtar {0} av {1} ({2} kvar)"
@@ -2048,10 +2056,10 @@ msgstr ""
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 "Kan inte ta bort nod som används av ytterligare objekt"
@@ -2066,7 +2074,7 @@ msgid "Make parallel copies of ways"
msgstr "Skapa parallella kopior av vägar"
msgid "make parallel helper line"
-msgstr ""
+msgstr "skapa parallell hjälplinje"
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
@@ -2516,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 ""
@@ -2724,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 ""
@@ -2821,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}"
@@ -2857,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"
@@ -2883,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}''"
@@ -3003,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"
@@ -3063,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"
@@ -3096,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"
@@ -3120,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}"
@@ -3150,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 "
@@ -3172,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 ""
@@ -3203,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}"
@@ -3234,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 ""
@@ -3395,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 ""
@@ -3503,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 ""
@@ -3541,9 +3548,6 @@ msgstr ""
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr "WGS84"
@@ -3584,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"
@@ -3608,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"
@@ -3669,6 +3685,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Dubbletter av noder"
@@ -3752,6 +3771,15 @@ 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"
@@ -3821,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"
@@ -3881,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 ""
@@ -3923,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}"
@@ -4069,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"
@@ -4146,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}"
@@ -4176,9 +4213,6 @@ msgstr "byggnad (building)"
msgid "area"
msgstr "yta"
-msgid "Unclosed way"
-msgstr "Ej sluten sträcka"
-
msgid "Unconnected ways"
msgstr ""
@@ -4207,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''"
@@ -4277,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)"
@@ -4397,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"
@@ -4610,7 +4627,7 @@ msgid "Tools"
msgstr "Verktyg"
msgid "More tools"
-msgstr ""
+msgstr "Fler verktyg"
msgid "Data"
msgstr ""
@@ -4642,6 +4659,18 @@ 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"
@@ -4746,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 ""
@@ -4828,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 "
@@ -5048,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"
@@ -5085,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 ""
@@ -5137,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 ""
@@ -5396,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 ""
@@ -5697,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 ""
@@ -5964,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"
@@ -6047,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"
@@ -6139,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 ""
@@ -6314,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"
@@ -6601,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"
@@ -6621,7 +6676,7 @@ msgid "Query changesets from a server URL"
msgstr ""
msgid "Advanced"
-msgstr ""
+msgstr "Avancerat"
msgid "Use a custom changeset query"
msgstr ""
@@ -6669,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"
@@ -6711,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)"
@@ -6871,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"
@@ -7191,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"
@@ -7335,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, "
@@ -7359,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 ""
@@ -7477,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."
@@ -7576,6 +7630,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7676,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"
@@ -7695,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 ""
@@ -7728,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 ""
@@ -7746,7 +7809,7 @@ msgid "Open changesets"
msgstr ""
msgid "Close changesets"
-msgstr ""
+msgstr "Stäng ändringsuppsättningar"
msgid "Close the selected open changesets"
msgstr ""
@@ -7761,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"
@@ -7837,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 ""
@@ -7852,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"
@@ -7877,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 ""
@@ -7904,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 "
@@ -8019,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"
@@ -8069,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 "
@@ -8089,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 ""
@@ -8104,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"
@@ -8111,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 ..."
@@ -8140,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 "
@@ -8149,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 "
@@ -8171,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"
@@ -8226,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..."
@@ -8238,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>"
@@ -8258,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:"
@@ -8404,7 +8498,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8434,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"
@@ -8800,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..."
@@ -8821,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"
@@ -8878,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"
@@ -8948,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 ""
@@ -9139,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}''..."
@@ -9161,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"
@@ -9171,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:"
@@ -9344,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 "
@@ -9392,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}''"
@@ -9480,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 ""
@@ -10127,9 +10219,9 @@ msgid "Add setting"
msgstr ""
msgid "Advanced Background: Changed"
-msgstr ""
+msgstr "Avancerad Bakgrund: Ändrad"
-msgid "Advanced Background: NonDefalut"
+msgid "Advanced Background: NonDefault"
msgstr ""
msgid "Current value is default."
@@ -10198,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 ""
@@ -10252,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 ""
@@ -10723,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"
@@ -10787,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"
@@ -11049,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 ""
@@ -11085,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 ""
@@ -11135,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:"
@@ -11145,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 "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 ""
@@ -11240,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 ""
@@ -11320,8 +11425,8 @@ msgstr "Tillämpa snabbval"
msgid "New relation"
msgstr ""
-msgid "Change Properties"
-msgstr "Ändra egenskaper"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -11393,15 +11498,12 @@ msgstr ""
msgid "Roles cannot appear more than once"
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 "Kunde inte läsa källan till snabbval för taggning: {0}"
-
msgid "Error parsing {0}: "
msgstr "Fel vid tolkning {0}: "
@@ -11420,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 ""
@@ -11451,9 +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 ""
@@ -11487,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 ""
@@ -11527,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..."
@@ -11647,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 ""
@@ -11662,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}."
@@ -11746,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!"
@@ -11845,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 ""
@@ -11885,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 ..."
@@ -11913,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>"
@@ -12000,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}."
@@ -12203,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 "RemoteControl::Accepting connections on port {0}"
@@ -12249,6 +12387,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."
@@ -12279,19 +12426,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 ""
@@ -12313,11 +12460,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}''."
@@ -12387,13 +12546,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}''"
@@ -12554,10 +12713,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"
@@ -12572,22 +12731,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}''"
@@ -12661,8 +12819,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..."
@@ -12677,12 +12834,27 @@ msgstr "Hämtar lista över insticksmoduler..."
msgid "Downloading plugin list from ''{0}''"
msgstr "Hämtar lista över insticksmoduler från ''{0}''"
-msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+msgid "Plugin list download error"
msgstr ""
-msgid "Writing plugin list to local cache ''{0}''"
+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 ""
msgid "Parsing plugin list from site ''{0}''"
@@ -13014,12 +13186,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -13030,9 +13201,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 ""
@@ -13064,8 +13278,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 "
@@ -13391,6 +13619,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 ""
@@ -13635,6 +13868,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."
@@ -13691,9 +13927,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 ""
@@ -13730,6 +13963,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 ""
@@ -13858,7 +14096,10 @@ msgid "Embankment"
msgstr "Bank"
msgid "Lit"
-msgstr ""
+msgstr "Belyst"
+
+msgid "Toll"
+msgstr "Betalstation"
msgid "Motorway Link"
msgstr "Motorvägslänk"
@@ -13950,6 +14191,50 @@ msgstr "Bostadsområde"
msgid "Edit Residential Street"
msgstr "Redigera en gata i bostadsområde"
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+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"
@@ -13968,11 +14253,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"
@@ -13983,6 +14268,9 @@ msgstr "uppfart"
msgid "parking_aisle"
msgstr "parkeringsväg"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Parkeringskorridor"
@@ -14010,18 +14298,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"
@@ -14031,9 +14313,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr "mål"
-
msgid "delivery"
msgstr "leveranser"
@@ -14043,15 +14322,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 ""
@@ -14097,6 +14376,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)"
@@ -14181,6 +14463,9 @@ msgstr "Redigera en bro"
msgid "viaduct"
msgstr "viadukt"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -14285,20 +14570,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"
@@ -14315,10 +14609,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"
@@ -14354,7 +14648,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -14423,12 +14717,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"
@@ -14444,15 +14744,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"
@@ -14474,15 +14765,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"
@@ -14492,12 +14795,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"
@@ -14528,9 +14828,6 @@ msgstr ""
msgid "Passing Place"
msgstr "Mötesplats"
-msgid "Edit Passing Place"
-msgstr "Redigera Mötesplats"
-
msgid "Turning Circle"
msgstr "Vändplats"
@@ -14573,6 +14870,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr "Tillåten trafik:"
+msgid "Material"
+msgstr "Material"
+
+msgid "stone"
+msgstr "sten"
+
msgid "Bollard"
msgstr "Trafikkon"
@@ -14588,6 +14891,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr "plast"
+
msgid "Cycle Barrier"
msgstr "Cykelhinder"
@@ -14657,19 +14963,16 @@ msgstr ""
msgid "electric"
msgstr "elektriskt"
-msgid "roundpole"
+msgid "pole"
msgstr ""
-msgid "split_rail"
+msgid "Guard Rail"
msgstr ""
-msgid "chain"
-msgstr "kedja"
-
-msgid "hedge"
-msgstr "häck"
+msgid "Edit Guard Rail"
+msgstr ""
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14700,8 +15003,9 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
-msgstr "Redigera dike"
+msgstr ""
msgid "Kerb"
msgstr ""
@@ -14709,11 +15013,11 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
-msgstr "Ingång"
+msgid "Entrance (barrier opening)"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Redigera en ingång"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Grind"
@@ -14766,12 +15070,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "sten"
-
msgid "Turnstile"
msgstr "Vändkors"
@@ -14832,12 +15130,21 @@ msgstr "Redigera en avloppsränna"
msgid "Ditch"
msgstr "Dike"
+msgid "Edit Ditch"
+msgstr "Redigera dike"
+
msgid "Stream"
msgstr "Bäck"
msgid "Edit Stream"
msgstr "Redigera en bäck"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Kanal"
@@ -14877,9 +15184,6 @@ msgstr "Redigera en damm"
msgid "Groyne"
msgstr "Vågbrytare"
-msgid "Edit Groyne"
-msgstr "Redigera vågbrytare"
-
msgid "Breakwater"
msgstr ""
@@ -14913,6 +15217,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"
@@ -14994,20 +15313,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"
@@ -15081,8 +15405,8 @@ msgstr "turism"
msgid "freight"
msgstr ""
-msgid "Service/Type"
-msgstr "Sidospår/Typ"
+msgid "Service type"
+msgstr ""
msgid "yard"
msgstr "bangård"
@@ -15105,11 +15429,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"
@@ -15120,9 +15447,6 @@ msgstr "Smalspår"
msgid "Edit Narrow Gauge Rail"
msgstr "Redigera en smalspårig järnväg"
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr "Monorail"
@@ -15174,6 +15498,9 @@ msgstr ""
msgid "Level Crossing"
msgstr "Plankorsning"
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -15186,18 +15513,32 @@ msgstr ""
msgid "Barrier"
msgstr ""
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
msgid "half"
-msgstr "halv"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "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"
@@ -15297,11 +15638,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -15313,13 +15652,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"
@@ -15336,12 +15673,12 @@ msgstr "yta"
msgid "underground"
msgstr "underjordisk"
+msgid "rooftop"
+msgstr "takparkering"
+
msgid "Access"
msgstr "Åtkomst"
-msgid "customers"
-msgstr "kunder"
-
msgid "Park and Ride"
msgstr ""
@@ -15369,9 +15706,6 @@ msgstr "Parkeringsplats"
msgid "Edit Parking space"
msgstr "Redigera Parkeringsplats"
-msgid "rooftop"
-msgstr "takparkering"
-
msgid "Capacity"
msgstr "Kapacitet"
@@ -15393,11 +15727,30 @@ 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 "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 "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"
msgstr ""
@@ -15546,6 +15899,9 @@ msgstr "Laddstation"
msgid "Edit Charging Station (for electric cars)"
msgstr "Redigera laddstation"
+msgid "Voltage"
+msgstr "Spänning"
+
msgid "Amperage"
msgstr "Ampere"
@@ -15567,6 +15923,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"
@@ -15594,6 +15956,12 @@ msgstr "Uthyrning"
msgid "Edit Car Rental"
msgstr "Redigera biluthyrning"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr "endast"
+
msgid "Sharing"
msgstr "Bilpool"
@@ -15618,22 +15986,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 ""
@@ -15655,9 +16007,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Kläder"
@@ -15852,6 +16201,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15882,6 +16234,9 @@ msgstr ""
msgid "Ferry"
msgstr "Färja"
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Bänk"
@@ -15894,9 +16249,6 @@ msgstr "Rullstol"
msgid "limited"
msgstr "begränsat"
-msgid "only"
-msgstr "endast"
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15906,8 +16258,13 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
-msgstr "Station"
+msgstr "Järnvägsstation"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Redigera Järnvägsstation"
msgid "Building"
msgstr "Byggnad"
@@ -15921,6 +16278,9 @@ msgstr "Redigera tunnelbaneingång"
msgid "Ticket Machine"
msgstr "Biljettmaskin"
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr "Referensnummer"
@@ -15945,14 +16305,6 @@ 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-Referens"
@@ -16001,8 +16353,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"
@@ -16055,6 +16407,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"
@@ -16063,7 +16430,7 @@ msgid "Edit Terminal Gate"
msgstr ""
msgid "Facilities"
-msgstr ""
+msgstr "Faciliteter"
msgid "Accommodation"
msgstr "Boende"
@@ -16077,21 +16444,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"
@@ -16281,9 +16633,6 @@ msgstr ""
msgid "Edit Stripclub"
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 "Tourism"
msgstr "Turism"
@@ -16305,9 +16654,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"
@@ -16320,6 +16675,9 @@ msgstr "gata"
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Visat område"
@@ -16359,6 +16717,9 @@ msgstr ""
msgid "Information Board"
msgstr "Informationstavla"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Tavlans innehåll"
@@ -16380,22 +16741,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"
@@ -16450,10 +16823,10 @@ msgid "Edit Horse riding"
msgstr ""
msgid "Brothel"
-msgstr ""
+msgstr "Bordell"
msgid "Edit Brothel"
-msgstr ""
+msgstr "Redigera Bordell"
msgid "Playground"
msgstr "Lekplats"
@@ -16525,50 +16898,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"
@@ -16585,6 +16952,12 @@ msgstr "katoliker"
msgid "evangelical"
msgstr "evangelister"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "jehovas_vittnen"
@@ -16597,6 +16970,9 @@ msgstr "metodister"
msgid "mormon"
msgstr "mormoner"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ortodoxa"
@@ -16615,106 +16991,206 @@ msgstr "kväkare"
msgid "roman_catholic"
msgstr ""
-msgid "shia"
-msgstr "shiamuslimer"
+msgid "russian_orthodox"
+msgstr ""
-msgid "sunni"
-msgstr "sunnimuslimer"
+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 "Fire Station"
-msgstr "Brandstation"
+msgid "vajrayana"
+msgstr ""
-msgid "Edit Fire Station"
-msgstr "Redigera brandstation"
+msgid "Hindu Temple"
+msgstr ""
-msgid "Post Office"
-msgstr "Postkontor"
+msgid "Edit Hindu Temple"
+msgstr ""
-msgid "Edit Post Office"
-msgstr "Redigera postkontor"
+msgid "vaishnavism"
+msgstr ""
-msgid "Education"
-msgstr "Undervisning"
+msgid "shaivism"
+msgstr ""
-msgid "Kindergarten"
-msgstr "Barndaghem"
+msgid "shaktism"
+msgstr ""
-msgid "Edit Kindergarten"
-msgstr "Redigera barndaghem"
+msgid "smartism"
+msgstr ""
-msgid "School"
-msgstr "Skola"
+msgid "Shinto Shrine"
+msgstr ""
-msgid "Edit School"
-msgstr "Redigera skola"
+msgid "Edit Shinto Shrine"
+msgstr ""
-msgid "University"
+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"
+
+msgid "Edit Fire Station"
+msgstr "Redigera brandstation"
+
+msgid "Post Office"
+msgstr "Postkontor"
+
+msgid "Edit Post Office"
+msgstr "Redigera postkontor"
+
+msgid "Education"
+msgstr "Undervisning"
+
+msgid "Kindergarten"
+msgstr "Barndaghem"
+
+msgid "Edit Kindergarten"
+msgstr "Redigera barndaghem"
+
+msgid "School"
+msgstr "Skola"
+
+msgid "Edit School"
+msgstr "Redigera skola"
+
+msgid "University"
msgstr "Högskola/universitet"
msgid "Edit University"
@@ -16735,6 +17211,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"
@@ -16745,10 +17227,10 @@ msgid "Edit Hospital"
msgstr "Redigera sjukhus"
msgid "Clinic"
-msgstr ""
+msgstr "Vårdcentral"
msgid "Edit Clinic"
-msgstr ""
+msgstr "Redigera Vårdcentral"
msgid "Doctors"
msgstr "Läkare"
@@ -16769,10 +17251,10 @@ msgid "Edit Nursing Home"
msgstr ""
msgid "Retirement Home"
-msgstr ""
+msgstr "Äldreboende"
msgid "Edit Retirement Home"
-msgstr ""
+msgstr "Redigera Äldreboende"
msgid "Pharmacy"
msgstr "Apotek"
@@ -16816,12 +17298,66 @@ msgstr "Veterinär"
msgid "Edit Veterinary"
msgstr "Redigera veterinär"
-msgid "Drinking water"
+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"
@@ -16831,6 +17367,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"
@@ -16840,31 +17400,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 ""
@@ -16892,8 +17458,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"
@@ -16919,21 +17485,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 "plastic"
-msgstr "plast"
-
msgid "Amount of Seats"
msgstr "Antal säten"
@@ -16968,8 +17528,17 @@ msgstr "Redigera ett jakttorn"
msgid "Height"
msgstr "Höjd"
+msgctxt "height"
msgid "low"
-msgstr "låg"
+msgstr ""
+
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
msgid "Hide"
msgstr "Dölj"
@@ -16977,9 +17546,6 @@ msgstr "Dölj"
msgid "Lock"
msgstr "Lås"
-msgid "Drinking Water"
-msgstr "Dricksvatten"
-
msgid "Edit Source of Potable Water"
msgstr ""
@@ -17011,6 +17577,9 @@ msgstr "damm"
msgid "Diameter (in mm)"
msgstr "Diameter (mm)"
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -17048,119 +17617,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"
@@ -17192,26 +17797,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 ""
@@ -17219,6 +17825,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "plan"
+
+msgid "sports_centre"
+msgstr "sporthall"
+
+msgid "stadium"
+msgstr "stadion"
+
msgid "10pin"
msgstr ""
@@ -17252,6 +17867,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"
@@ -17308,7 +17939,7 @@ msgid "Skating"
msgstr "Skridskoåkning"
msgid "Edit Skating"
-msgstr "Redigera skridskoåkning"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -17352,36 +17983,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 ""
@@ -17424,19 +18073,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 ""
@@ -17483,7 +18128,7 @@ msgid "Edit Golf"
msgstr "Redigera golf"
msgid "golf_course"
-msgstr "golf_bana"
+msgstr "golfbana"
msgid "Boule"
msgstr "Boule"
@@ -17575,6 +18220,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"
@@ -17587,38 +18244,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 ""
@@ -17626,20 +18318,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"
@@ -17820,111 +18551,227 @@ msgstr ""
msgid "Edit Water Works"
msgstr ""
-msgid "Wastewater Plant"
-msgstr "Reningsverk"
+msgid "Wastewater Plant"
+msgstr "Reningsverk"
+
+msgid "Edit Wastewater Plant"
+msgstr "Redigera reningsverk"
+
+msgid "Watermill"
+msgstr ""
+
+msgid "Edit Watermill"
+msgstr ""
+
+msgid "Fountain"
+msgstr "Fontän"
+
+msgid "Edit Fountain"
+msgstr "Redigera en fontän"
+
+msgid "Water Well"
+msgstr "Brunn"
+
+msgid "Edit Water Well"
+msgstr "Redigera Brunn"
+
+msgid "Lighthouse"
+msgstr "Fyrtorn"
+
+msgid "Edit Lighthouse"
+msgstr "Fyrtorn"
+
+msgid "Edit Beacon"
+msgstr "Redigera fyrbåk"
+
+msgid "Street Lamp"
+msgstr "Gatulampa"
+
+msgid "Edit Street Lamp"
+msgstr "Redigera Gatulampa"
+
+msgid "Operation times"
+msgstr ""
+
+msgid "Mo-Fr 22:00-05:00"
+msgstr "Mån-Fre 22:00-05:00"
+
+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 "Noise"
+msgstr ""
+
+msgid "GPS Signals"
+msgstr ""
+
+msgid "GLONASS Signals"
+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 "Mätpunkt"
+
+msgid "Edit Survey Point"
+msgstr "Redigera mätpunkt"
+
+msgid "Surveillance Camera"
+msgstr ""
+
+msgid "Edit Surveillance Camera"
+msgstr "Redigera övervakningskamera"
+
+msgid "indoor"
+msgstr "inomhus"
-msgid "Edit Wastewater Plant"
-msgstr "Redigera reningsverk"
+msgid "outdoor"
+msgstr "utomhus"
-msgid "Watermill"
+msgid "Zone"
msgstr ""
-msgid "Edit Watermill"
+msgid "parking"
msgstr ""
-msgid "Fountain"
-msgstr "Fontän"
-
-msgid "Edit Fountain"
-msgstr "Redigera en fontän"
+msgid "traffic"
+msgstr ""
-msgid "Water Well"
-msgstr "Brunn"
+msgid "shop"
+msgstr "affär"
-msgid "Edit Water Well"
-msgstr "Redigera Brunn"
+msgid "bank"
+msgstr ""
-msgid "Lighthouse"
-msgstr "Fyrtorn"
+msgid "Camera"
+msgstr ""
-msgid "Edit Lighthouse"
-msgstr "Fyrtorn"
+msgid "fixed"
+msgstr ""
-msgid "Edit Beacon"
-msgstr "Redigera fyrbåk"
+msgid "panning"
+msgstr ""
-msgid "Street Lamp"
-msgstr "Gatulampa"
+msgid "dome"
+msgstr ""
-msgid "Edit Street Lamp"
-msgstr "Redigera Gatulampa"
+msgid "Mounted on"
+msgstr ""
-msgid "Operation times"
+msgid "ceiling"
msgstr ""
-msgid "Mo-Fr 22:00-05:00"
-msgstr "Mån-Fre 22:00-05:00"
+msgid "Direction in degrees"
+msgstr ""
-msgid "Measurement Station"
-msgstr "Mätstation"
+msgid "Inclination in degrees"
+msgstr ""
-msgid "Edit Measurement Station"
-msgstr "Redigera Mätstation"
+msgid "Height in meter (m)"
+msgstr ""
-msgid "Measurement"
-msgstr "Mätning"
+msgid "Power"
+msgstr "Elkraft"
-msgid "particulate_matter"
+msgid "Power Plant"
msgstr ""
-msgid "seismic"
-msgstr "seismisk"
+msgid "Edit Power Plant"
+msgstr ""
-msgid "water_level"
-msgstr "vattennivå"
+msgid "Start date"
+msgstr ""
-msgid "weather"
-msgstr "väder"
+msgid "Output forms of energy"
+msgstr ""
-msgid "Recording"
-msgstr "Spelar in"
+msgid "(please add this information to the generators if possible)"
+msgstr ""
-msgid "manually"
-msgstr "manuellt"
+msgid "electricity"
+msgstr "elektricitet"
-msgid "automated"
-msgstr "automatiserat"
+msgid "2 W"
+msgstr "2 W"
-msgid "remote"
-msgstr "fjärrstyrd"
+msgid "3 kW"
+msgstr "3 kW"
-msgctxt "display"
-msgid "no"
-msgstr "nej"
+msgid "5 MW"
+msgstr "5 MW"
-msgid "Survey Point"
-msgstr "Mätpunkt"
+msgid "7 GW"
+msgstr "7 GW"
-msgid "Edit Survey Point"
-msgstr "Redigera mätpunkt"
+msgid "hot water"
+msgstr "hetvatten"
-msgid "Surveillance"
-msgstr "Övervakning"
+msgid "hot air"
+msgstr "hetluft"
-msgid "Edit Surveillance Camera"
-msgstr "Redigera övervakningskamera"
+msgid "cold water"
+msgstr "kallvatten"
-msgid "indoor"
-msgstr "inomhus"
+msgid "cold air"
+msgstr "kalluft"
-msgid "outdoor"
-msgstr "utomhus"
+msgid "compressed air"
+msgstr "tryckluft"
-msgid "public"
-msgstr "offentlig"
+msgid "steam"
+msgstr "ånga"
-msgid "Power"
-msgstr "Elkraft"
+msgid "vacuum"
+msgstr "vacuum"
msgid "Power Generator"
msgstr "Kraftverk"
@@ -17977,89 +18824,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 "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 "battery charging"
-msgstr "batteriladdning"
+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 "Kraftstation"
+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"
@@ -18070,12 +19020,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"
@@ -18085,6 +19050,9 @@ msgstr "Redigera en kraftledningsmast"
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr "Elstolpe"
@@ -18103,11 +19071,9 @@ msgstr "Redigera en kraftledning"
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -18216,11 +19182,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"
@@ -18231,8 +19197,8 @@ msgstr "Redigera slakteri"
msgid "Seafood"
msgstr "Skaldjur"
-msgid "Edit Seafood"
-msgstr "Redigera Skaldjur"
+msgid "Edit Seafood Shop"
+msgstr ""
msgid "Deli (Fine Food)"
msgstr ""
@@ -18252,6 +19218,9 @@ msgstr "Marknad"
msgid "Edit Marketplace"
msgstr "Redigera Marknad"
+msgid "Organic"
+msgstr "Organisk"
+
msgid "Greengrocer"
msgstr ""
@@ -18264,9 +19233,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr "Organisk"
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -18336,8 +19302,8 @@ msgstr "Redigera skrädderi"
msgid "Fabric"
msgstr "Tyg"
-msgid "Edit Fabric"
-msgstr "Redigera Tyg"
+msgid "Edit Fabric Shop"
+msgstr ""
msgid "Electronic"
msgstr "Elektronik"
@@ -18357,14 +19323,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"
@@ -18372,9 +19338,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"
@@ -18400,6 +19365,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"
@@ -18424,23 +19395,44 @@ msgstr "Hårfrisör"
msgid "Edit Hairdresser"
msgstr "Redigera hårfrisör"
-msgid "Optician"
-msgstr "Optiker"
+msgid "Optician"
+msgstr "Optiker"
+
+msgid "Edit Optician"
+msgstr "Redigera optiker"
+
+msgid "Jewelry"
+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 "Edit Optician"
-msgstr "Redigera optiker"
+msgid "hindu"
+msgstr "hinduism"
-msgid "Jewelry"
-msgstr "Guldsmed"
+msgid "jewish"
+msgstr "judendom"
-msgid "Edit Jewelry"
-msgstr "Redigera guldsmed"
+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"
@@ -18469,8 +19461,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"
@@ -18481,20 +19473,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"
@@ -18529,8 +19521,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"
@@ -18742,6 +19734,12 @@ msgstr "Topp"
msgid "Edit Peak"
msgstr "Redigera topp"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Glaciär"
@@ -18781,24 +19779,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"
@@ -18808,15 +19815,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 ""
@@ -18892,6 +19890,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"
@@ -18946,7 +19950,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"
@@ -18958,6 +19962,9 @@ msgstr "Kyrkogård"
msgid "Edit Graveyard"
msgstr "Redigera kyrkogård"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Begravningsplats"
@@ -18974,13 +19981,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"
@@ -19033,6 +20040,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"
@@ -19069,6 +20103,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 ""
@@ -19237,20 +20283,49 @@ msgstr ""
msgid "Edit general route"
msgstr ""
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+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 ""
@@ -19297,19 +20372,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"
@@ -19333,7 +20411,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -19429,18 +20507,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"
@@ -19450,8 +20537,11 @@ msgstr "Hinder"
msgid "motorroad"
msgstr ""
-msgid "highway_track"
-msgstr "landsvägsspår"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr ""
@@ -19459,10 +20549,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -19480,6 +20570,9 @@ msgstr ""
msgid "railwaypoint"
msgstr "järnvägspunkt"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19495,28 +20588,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"
@@ -19537,20 +20630,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"
@@ -19624,10 +20717,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"
@@ -19642,9 +20738,6 @@ msgstr "Mindre tätort/Stad"
msgid "One Way"
msgstr "Enkelriktat"
-msgid "Church"
-msgstr "Kyrka"
-
msgid "Fuel Station"
msgstr "Bensinstation"
@@ -19672,6 +20765,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19717,10 +20813,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"
@@ -19732,7 +20858,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"
@@ -19750,7 +20876,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19867,19 +20993,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 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"
@@ -19888,17 +21125,56 @@ msgstr ""
msgid "unknown christian denomination"
msgstr ""
-msgid "unknown muslim denomination"
+msgid "unknown muslim denomination"
+msgstr ""
+
+msgid "unknown jewish denomination"
+msgstr ""
+
+msgid ""
+"no wikipedia-language given, use ''wikipedia''=''language:page title''"
+msgstr ""
+
+msgid "unknown language prefix in wikipedia tag"
+msgstr ""
+
+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 "unknown jewish denomination"
+msgid "unusual frequency specification"
msgstr ""
-msgid ""
-"no wikipedia-language given, use ''wikipedia''=''language:page title''"
+msgid "unusual train track gauge; use mm with no separator"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unusual incline; use percentages/degrees or up/down"
msgstr ""
msgid "Landsat"
@@ -19910,19 +21186,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 "skobbler heatmap"
@@ -19943,7 +21228,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19952,6 +21237,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -20098,6 +21386,29 @@ 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 ""
@@ -20263,6 +21574,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -20308,6 +21622,39 @@ msgstr ""
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 "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 ""
@@ -20509,6 +21856,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 ""
@@ -20530,13 +21889,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20799,10 +22152,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -21006,7 +22362,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"
@@ -21277,15 +22633,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -21293,7 +22640,7 @@ msgid "Rotate crosshair"
msgstr ""
msgid "Advanced settings"
-msgstr ""
+msgstr "Avancerade inställningar"
msgid "Buildings tags:"
msgstr ""
@@ -21323,7 +22670,7 @@ msgid "Length step:"
msgstr ""
msgid "Advanced..."
-msgstr ""
+msgstr "Avancerat..."
msgid "Draw buildings"
msgstr ""
@@ -21456,6 +22803,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 ""
@@ -21474,12 +22824,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21619,6 +22963,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 ""
@@ -21636,6 +22983,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?"
@@ -21862,7 +23212,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."
@@ -21914,7 +23267,7 @@ msgstr "Ta bort valt schema från listan."
msgid "Color Schemes"
msgstr "Färgscheman"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -22140,27 +23493,9 @@ 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 "configure the connected DG100"
-msgstr "anpassa den anslutna DG100"
-
-msgid "delete data after import"
-msgstr "ta bort data efter import"
-
msgid "Importing data from device."
msgstr "Importerar data från enhet."
@@ -23253,9 +24588,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 ""
@@ -23904,9 +25260,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 "Process queue"
msgstr ""
@@ -23961,18 +25314,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 ""
@@ -24321,6 +25662,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -24472,6 +25834,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 ""
@@ -24789,9 +26154,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -25007,6 +26369,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 ""
@@ -25039,15 +26404,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 ""
@@ -25162,9 +26543,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)"
@@ -25343,19 +26721,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"
@@ -25574,6 +26952,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 ""
@@ -25610,6 +27077,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..."
@@ -25762,9 +27232,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26750,9 +28217,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr "Tar bort alla noder från urvaö"
-msgid "Video"
-msgstr "Video"
-
msgid "Import Video"
msgstr ""
@@ -27037,9 +28501,6 @@ msgstr "Standardspråket för Wikipedia-artiklar"
msgid "Enter the Wikipedia language"
msgstr "Ange Wikipedia språk"
-msgid "Add Tag"
-msgstr "Lägg till tagg"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/ta.po b/i18n/po/ta.po
index 84c506c..44a11b4 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-08-04 03:41+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-08-05 05:01+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -61,6 +64,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -161,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 ""
@@ -255,9 +261,6 @@ msgstr "கருவி: {0}"
msgid "Please select at least four nodes."
msgstr "குளைந்தபட்தமாக நாங்கு பள்ளிகளை தேர்ந்தெடுக"
-msgid "Information"
-msgstr "தகவல்"
-
msgid "Align Nodes in Line"
msgstr "பள்ளிகளை கோடாக வரிசைப்படுத்து"
@@ -294,6 +297,9 @@ msgstr "அடுத்த"
msgid "Nothing selected to zoom to."
msgstr "பெரியதாக்குவதற்கான குறி தேர்ந்த்தெடுக்கபடவில்லை"
+msgid "Information"
+msgstr "தகவல்"
+
msgid "Zoom to {0}"
msgstr "{0} வரை பெரியதாக்கு"
@@ -349,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} வழிகளை இணை"
@@ -535,6 +540,9 @@ msgstr ""
"OSM வழிகள், புள்ளிகள், தொடர்ப்புகள் ஆகியவற்றைப் பற்றி வரலாறு தகவலைக் "
"காட்டவும்"
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -654,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 ""
@@ -804,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"
@@ -992,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 "
@@ -1020,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>"
@@ -1190,9 +1189,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1339,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} பாகங்களாக பிரி."
@@ -1440,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 "செயல்நீக்கு"
@@ -1726,6 +1737,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1945,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] ""
@@ -2371,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 ""
@@ -2567,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 ""
@@ -2654,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 ""
@@ -2690,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"
@@ -2716,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}''"
@@ -2821,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] ""
@@ -2881,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"
@@ -2912,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"
@@ -2936,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 ""
@@ -2966,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 ""
@@ -2986,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 ""
@@ -2995,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 ""
@@ -3015,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}"
@@ -3046,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}''."
@@ -3203,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 ""
@@ -3311,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 ""
@@ -3349,9 +3370,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3390,6 +3408,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3414,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 ""
@@ -3473,6 +3503,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3555,6 +3588,15 @@ 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 ""
@@ -3624,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 ""
@@ -3681,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})"
@@ -3719,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}"
@@ -3856,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"
@@ -3931,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 ""
@@ -3961,9 +4012,6 @@ msgstr "கட்டிடம்"
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3988,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''"
@@ -4054,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 ""
@@ -4174,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"
@@ -4403,6 +4434,18 @@ 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 ""
@@ -4507,19 +4550,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 ""
@@ -4807,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"
@@ -4844,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"
@@ -4896,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 ""
@@ -5153,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 ""
@@ -5681,6 +5721,9 @@ msgstr "காண்பி/மறை"
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5764,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 ""
@@ -5854,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 ""
@@ -6025,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 ""
@@ -6312,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"
@@ -6379,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 "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"
@@ -6421,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)"
@@ -6581,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"
@@ -6899,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 ""
@@ -7030,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, "
@@ -7054,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 ""
@@ -7167,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."
@@ -7266,6 +7336,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7353,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"
@@ -7372,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 ""
@@ -7438,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"
@@ -7514,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 ""
@@ -7529,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"
@@ -7745,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 "
@@ -7759,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 ""
@@ -7774,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 ""
@@ -7781,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 ..."
@@ -7894,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] ""
@@ -7906,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>"
@@ -7922,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:"
@@ -8068,7 +8170,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8098,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"
@@ -8453,9 +8555,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8474,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 ""
@@ -8531,6 +8633,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8597,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 ""
@@ -8780,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}''..."
@@ -8802,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"
@@ -8812,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:"
@@ -9033,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}''"
@@ -9748,6 +9848,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9816,6 +9949,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9869,6 +10005,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 ""
@@ -10325,6 +10466,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 ""
@@ -10388,7 +10535,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 ""
@@ -10646,21 +10793,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 ""
@@ -10682,6 +10814,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 ""
@@ -10732,8 +10879,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:"
@@ -10742,20 +10889,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 ""
@@ -10837,14 +10989,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"
@@ -10917,7 +11063,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10996,9 +11142,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -11017,6 +11160,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 ""
@@ -11046,9 +11197,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 ""
@@ -11079,7 +11270,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 ""
@@ -11119,28 +11310,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..."
@@ -11235,6 +11424,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11250,12 +11442,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}."
@@ -11334,7 +11534,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11433,35 +11633,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 ""
@@ -11471,8 +11647,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 ..."
@@ -11499,10 +11675,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>"
@@ -11586,8 +11759,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}."
@@ -11784,7 +11957,7 @@ 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}"
@@ -11830,6 +12003,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."
@@ -11860,19 +12042,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 ""
@@ -11894,11 +12076,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 ""
@@ -11968,13 +12162,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}''"
@@ -12117,10 +12311,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"
@@ -12135,22 +12329,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}''"
@@ -12219,8 +12412,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..."
@@ -12235,9 +12427,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}''"
@@ -12559,12 +12766,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12575,16 +12781,59 @@ 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 "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 ""
+
+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 ""
@@ -12609,9 +12858,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."
@@ -12934,6 +13197,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 ""
@@ -13173,6 +13441,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."
@@ -13222,9 +13493,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 ""
@@ -13261,6 +13529,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 ""
@@ -13391,6 +13664,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13481,6 +13757,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 ""
@@ -13499,10 +13819,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13514,6 +13834,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13541,18 +13864,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 ""
@@ -13562,9 +13879,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13574,13 +13888,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13628,6 +13942,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13712,6 +14029,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13816,21 +14136,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 ""
@@ -13846,10 +14175,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"
@@ -13885,7 +14214,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13954,12 +14283,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 ""
@@ -13975,15 +14310,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 ""
@@ -14005,6 +14331,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -14014,6 +14349,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -14023,10 +14361,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14059,9 +14394,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14101,7 +14433,19 @@ msgstr ""
msgid "Edit Block"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
msgstr ""
msgid "Bollard"
@@ -14119,6 +14463,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14188,19 +14535,16 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
-msgstr ""
-
-msgid "split_rail"
+msgid "pole"
msgstr ""
-msgid "chain"
+msgid "Guard Rail"
msgstr ""
-msgid "hedge"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14231,6 +14575,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14240,10 +14585,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14297,12 +14642,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14363,12 +14702,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14408,9 +14756,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14444,6 +14789,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 ""
@@ -14525,18 +14885,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 ""
@@ -14612,7 +14977,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14636,10 +15001,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"
@@ -14651,9 +15019,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14705,6 +15070,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14717,6 +15085,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14828,11 +15231,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14844,11 +15245,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14867,10 +15266,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14900,9 +15299,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14924,37 +15320,56 @@ 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 "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 "Fuel"
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
msgstr ""
-msgid "Edit Fuel"
+msgid "sunrise-sunset"
msgstr ""
-msgid "Brand"
+msgid "Su 10:00+"
msgstr ""
-msgid "Agip"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
-msgid "Aral"
+msgid "Parking entrance"
msgstr ""
-msgid "Avia"
+msgid "Edit Parking entrance"
msgstr ""
-msgid "BP"
+msgid "Fuel"
+msgstr ""
+
+msgid "Edit Fuel"
+msgstr ""
+
+msgid "Brand"
+msgstr ""
+
+msgid "Agip"
+msgstr ""
+
+msgid "Aral"
+msgstr ""
+
+msgid "Avia"
+msgstr ""
+
+msgid "BP"
msgstr ""
msgid "Chevron"
@@ -15077,6 +15492,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15098,6 +15516,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15125,6 +15549,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15149,22 +15579,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 ""
@@ -15186,9 +15600,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15383,6 +15794,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15413,6 +15827,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15425,9 +15842,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15437,9 +15851,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15452,6 +15871,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15476,14 +15898,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15532,7 +15946,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15586,41 +16000,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"
@@ -15812,9 +16226,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15836,9 +16247,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15851,6 +16268,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15890,6 +16310,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15911,22 +16334,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"
@@ -16056,49 +16491,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"
@@ -16116,6 +16545,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16128,6 +16563,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16146,37 +16584,137 @@ 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"
@@ -16266,6 +16804,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 "உடல்நலம்"
@@ -16347,83 +16891,167 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+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 ""
+
+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 "Edit Recycling station"
+msgid "Shows barometric pressure"
+msgstr ""
+
+msgid "Shows humidity"
+msgstr ""
+
+msgid "Recycling"
+msgstr ""
+
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16450,21 +17078,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 "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16499,16 +17121,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16542,6 +17170,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16579,117 +17210,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 ""
@@ -16723,33 +17390,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 ""
@@ -16783,6 +17460,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 ""
@@ -16883,36 +17576,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 ""
@@ -16955,19 +17666,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 ""
@@ -17106,6 +17813,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 ""
@@ -17118,60 +17837,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 ""
@@ -17396,41 +18189,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"
@@ -17439,7 +18258,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17451,12 +18270,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 ""
@@ -17508,97 +18417,215 @@ 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 "battery charging"
+msgid "reciprocating_engine"
msgstr ""
-msgid "Power Station"
+msgid "biofuel, biogas, diesel, gas, gasoline"
msgstr ""
-msgid "Edit Power Station"
+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 "Power Sub Station"
+msgid "low"
msgstr ""
-msgid "Edit Power Sub Station"
+msgid "750000;200000"
msgstr ""
-msgid "Line reference"
+msgid "110000;20000"
msgstr ""
msgid "Cable Distribution Cabinet"
@@ -17616,6 +18643,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17634,11 +18664,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17747,10 +18775,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17762,7 +18790,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17783,6 +18811,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17795,9 +18826,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17867,7 +18895,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17888,13 +18916,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"
@@ -17903,9 +18931,8 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
-msgstr ""
+msgstr "வீடியோ"
msgid "Edit Video Shop"
msgstr ""
@@ -17931,6 +18958,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17967,10 +19000,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"
@@ -18000,7 +19054,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18012,19 +19066,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"
@@ -18060,7 +19114,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18273,6 +19327,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18312,24 +19372,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 ""
@@ -18339,15 +19408,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18423,6 +19483,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18477,7 +19543,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18489,6 +19555,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18564,6 +19633,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 ""
@@ -18600,6 +19696,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18768,21 +19876,50 @@ 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 ""
+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 ""
@@ -18828,19 +19965,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"
@@ -18864,7 +20004,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18960,18 +20100,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 ""
@@ -18981,7 +20130,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18990,10 +20142,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -19011,6 +20163,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19026,28 +20181,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"
@@ -19068,19 +20223,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"
@@ -19155,10 +20310,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19173,9 +20331,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19203,6 +20358,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19248,10 +20406,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"
@@ -19263,7 +20451,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"
@@ -19281,7 +20469,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19398,19 +20586,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 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"
@@ -19425,11 +20724,50 @@ msgstr ""
msgid "unknown jewish denomination"
msgstr ""
-msgid ""
-"no wikipedia-language given, use ''wikipedia''=''language:page title''"
+msgid ""
+"no wikipedia-language given, use ''wikipedia''=''language:page title''"
+msgstr ""
+
+msgid "unknown language prefix in wikipedia tag"
+msgstr ""
+
+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 "unkown language prefix in wikipedia tag"
+msgid "unusual incline; use percentages/degrees or up/down"
msgstr ""
msgid "Landsat"
@@ -19441,19 +20779,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 "skobbler heatmap"
@@ -19474,7 +20821,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19483,6 +20830,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19629,6 +20979,29 @@ 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 ""
@@ -19794,6 +21167,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19839,6 +21215,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -20040,6 +21449,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 ""
@@ -20061,13 +21482,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20330,10 +21745,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20537,7 +21955,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"
@@ -20808,15 +22226,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20987,6 +22396,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 ""
@@ -21005,12 +22417,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21146,6 +22552,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 ""
@@ -21163,6 +22572,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 ""
@@ -21389,7 +22801,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."
@@ -21439,7 +22854,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21663,27 +23078,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 ""
@@ -22761,9 +24158,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 ""
@@ -23410,9 +24830,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23465,18 +24882,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 ""
@@ -23823,6 +25228,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23974,6 +25400,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 ""
@@ -24291,9 +25720,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24509,6 +25935,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 ""
@@ -24541,15 +25970,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 ""
@@ -24664,9 +26109,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24845,19 +26287,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"
@@ -25073,6 +26515,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 ""
@@ -25109,6 +26640,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..."
@@ -25261,9 +26795,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26249,9 +27780,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr "வீடியோ"
-
msgid "Import Video"
msgstr ""
@@ -26530,9 +28058,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 9e63108..b7d45bf 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-08-04 03:41+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-08-05 05:01+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 ""
@@ -250,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr "సమాచారం"
-
msgid "Align Nodes in Line"
msgstr ""
@@ -289,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr "సమాచారం"
+
msgid "Zoom to {0}"
msgstr ""
@@ -343,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 ""
@@ -523,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -636,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 ""
@@ -786,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"
@@ -972,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 ""
@@ -995,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>"
@@ -1163,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1304,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"
@@ -1399,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 ""
@@ -1683,6 +1703,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1902,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] ""
@@ -2328,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 ""
@@ -2524,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 ""
@@ -2611,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 ""
@@ -2647,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"
@@ -2673,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}''"
@@ -2778,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] ""
@@ -2838,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"
@@ -2869,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"
@@ -2893,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 ""
@@ -2923,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 ""
@@ -2943,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 ""
@@ -2952,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 ""
@@ -2972,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}"
@@ -3003,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}''."
@@ -3160,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 ""
@@ -3268,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 ""
@@ -3306,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3347,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3371,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 ""
@@ -3430,6 +3469,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3512,6 +3554,15 @@ 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 ""
@@ -3581,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 ""
@@ -3638,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})"
@@ -3676,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}"
@@ -3813,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"
@@ -3888,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 ""
@@ -3918,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3945,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''"
@@ -4011,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 ""
@@ -4131,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"
@@ -4360,6 +4400,18 @@ 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 ""
@@ -4464,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 ""
@@ -4764,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"
@@ -4801,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"
@@ -4853,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 ""
@@ -5110,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 ""
@@ -5638,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5721,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 ""
@@ -5811,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 ""
@@ -5982,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 ""
@@ -6269,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"
@@ -6335,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"
@@ -6377,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)"
@@ -6537,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"
@@ -6855,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 ""
@@ -6986,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 ""
@@ -7010,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 ""
@@ -7123,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."
@@ -7222,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7309,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"
@@ -7328,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 ""
@@ -7394,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"
@@ -7470,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 ""
@@ -7485,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"
@@ -7701,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 "
@@ -7715,13 +7795,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7730,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 ""
@@ -7737,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 ..."
@@ -7850,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] ""
@@ -7862,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>"
@@ -7878,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:"
@@ -8024,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8054,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"
@@ -8407,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8428,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 ""
@@ -8485,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8551,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 ""
@@ -8734,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}''..."
@@ -8756,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"
@@ -8766,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:"
@@ -8987,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}''"
@@ -9702,6 +9811,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9770,6 +9912,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9823,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 ""
@@ -10279,6 +10429,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 ""
@@ -10342,7 +10498,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 ""
@@ -10600,40 +10756,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}''"
@@ -10686,8 +10842,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:"
@@ -10696,20 +10852,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 ""
@@ -10791,14 +10952,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,7 +11026,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10950,9 +11105,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10971,6 +11123,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 ""
@@ -11000,9 +11160,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 ""
@@ -11033,7 +11233,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 ""
@@ -11073,28 +11273,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..."
@@ -11189,6 +11387,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11204,12 +11405,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}."
@@ -11288,7 +11497,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11387,35 +11596,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 ""
@@ -11425,8 +11610,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 ..."
@@ -11453,10 +11638,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>"
@@ -11540,8 +11722,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}."
@@ -11738,7 +11920,7 @@ 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}"
@@ -11784,6 +11966,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."
@@ -11814,19 +12005,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 ""
@@ -11848,11 +12039,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 ""
@@ -11922,13 +12125,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}''"
@@ -12071,10 +12274,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"
@@ -12089,22 +12292,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}''"
@@ -12173,8 +12375,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..."
@@ -12189,9 +12390,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}''"
@@ -12513,12 +12729,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12529,30 +12744,73 @@ 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 "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] ""
+
+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"
@@ -12563,9 +12821,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."
@@ -12888,6 +13160,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 ""
@@ -13127,6 +13404,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."
@@ -13176,9 +13456,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 ""
@@ -13215,6 +13492,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 ""
@@ -13345,6 +13627,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13435,6 +13720,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 ""
@@ -13453,10 +13782,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 +13797,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13495,18 +13827,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 ""
@@ -13516,9 +13842,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13528,13 +13851,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13582,6 +13905,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13666,6 +13992,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13770,21 +14099,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 ""
@@ -13800,10 +14138,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"
@@ -13839,7 +14177,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13908,12 +14246,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 ""
@@ -13929,15 +14273,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 ""
@@ -13959,6 +14294,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13968,6 +14312,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13977,10 +14324,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14013,9 +14357,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14058,6 +14399,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14073,6 +14420,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14142,19 +14492,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14185,6 +14529,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14194,10 +14539,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14251,12 +14596,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14317,12 +14656,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14362,9 +14710,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14398,6 +14743,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 ""
@@ -14479,18 +14839,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 ""
@@ -14566,7 +14931,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14590,10 +14955,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"
@@ -14605,9 +14973,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14659,6 +15024,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14671,6 +15039,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14782,11 +15185,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14798,11 +15199,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14821,10 +15220,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14854,9 +15253,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14878,10 +15274,29 @@ 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"
@@ -15031,6 +15446,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15052,6 +15470,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15079,6 +15503,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15103,22 +15533,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 ""
@@ -15140,9 +15554,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15337,6 +15748,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15367,6 +15781,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15379,9 +15796,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15391,9 +15805,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15406,6 +15825,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15430,14 +15852,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15486,7 +15900,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15540,41 +15954,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"
@@ -15766,9 +16180,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15790,9 +16201,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15805,6 +16222,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15844,6 +16264,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15865,22 +16288,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"
@@ -16010,49 +16445,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"
@@ -16070,6 +16499,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16082,6 +16517,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16100,37 +16538,137 @@ 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"
@@ -16220,6 +16758,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 ""
@@ -16301,128 +16845,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16453,16 +17075,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16496,6 +17124,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16533,117 +17164,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 ""
@@ -16677,33 +17344,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 ""
@@ -16737,6 +17414,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 ""
@@ -16837,36 +17530,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 ""
@@ -16909,19 +17620,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 ""
@@ -17060,6 +17767,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 ""
@@ -17072,60 +17791,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 ""
@@ -17350,41 +18143,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"
@@ -17393,7 +18212,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17405,12 +18224,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 ""
@@ -17462,88 +18371,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17555,6 +18567,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 ""
@@ -17570,6 +18597,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17588,11 +18618,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17701,10 +18729,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17716,7 +18744,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17737,6 +18765,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17749,9 +18780,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17821,7 +18849,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17842,13 +18870,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"
@@ -17857,7 +18885,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17885,6 +18912,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17921,10 +18954,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"
@@ -17954,7 +19008,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17966,19 +19020,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"
@@ -18014,7 +19068,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18227,6 +19281,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18266,24 +19326,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 ""
@@ -18293,15 +19362,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18377,6 +19437,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18431,7 +19497,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18443,6 +19509,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18479,43 +19548,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18554,6 +19650,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18722,21 +19830,50 @@ 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 ""
+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 ""
@@ -18782,19 +19919,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"
@@ -18818,7 +19958,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18914,18 +20054,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 ""
@@ -18935,7 +20084,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18944,10 +20096,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18965,6 +20117,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18980,28 +20135,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"
@@ -19022,19 +20177,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"
@@ -19109,10 +20264,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19127,9 +20285,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19157,6 +20312,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19202,10 +20360,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"
@@ -19217,7 +20405,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"
@@ -19235,7 +20423,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19352,19 +20540,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 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"
@@ -19383,7 +20682,46 @@ 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 "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 "Landsat"
@@ -19395,19 +20733,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 "skobbler heatmap"
@@ -19428,7 +20775,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19437,6 +20784,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19583,6 +20933,29 @@ 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 ""
@@ -19748,6 +21121,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19793,6 +21169,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19979,19 +21388,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20015,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}''."
@@ -20284,10 +21699,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20491,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"
@@ -20762,15 +22180,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20941,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 ""
@@ -20959,12 +22371,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21100,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 ""
@@ -21117,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 ""
@@ -21343,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."
@@ -21393,7 +22808,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21578,6 +22993,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21617,27 +23097,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 ""
@@ -22715,9 +24177,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 ""
@@ -23364,9 +24843,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23419,18 +24895,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 ""
@@ -23777,6 +25241,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23928,6 +25413,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 ""
@@ -24245,9 +25733,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24463,6 +25948,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 ""
@@ -24495,15 +25983,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 ""
@@ -24618,9 +26122,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24799,19 +26300,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"
@@ -25027,6 +26528,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 ""
@@ -25063,6 +26653,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..."
@@ -25215,9 +26808,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26203,9 +27793,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26484,9 +28071,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 0e3c44a..eff4b31 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-08-04 03:41+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-08-05 05:02+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 ""
@@ -250,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -289,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -343,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 ""
@@ -523,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -636,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 ""
@@ -786,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"
@@ -972,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 ""
@@ -995,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>"
@@ -1163,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1304,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"
@@ -1399,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 ""
@@ -1683,6 +1703,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1902,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] ""
@@ -2328,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 ""
@@ -2524,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 ""
@@ -2611,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 ""
@@ -2647,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"
@@ -2673,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}''"
@@ -2778,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] ""
@@ -2838,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"
@@ -2869,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"
@@ -2893,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 ""
@@ -2923,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 ""
@@ -2943,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 ""
@@ -2952,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 ""
@@ -2972,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}"
@@ -3003,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}''."
@@ -3160,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 ""
@@ -3268,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 ""
@@ -3306,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3347,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3371,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 ""
@@ -3430,6 +3469,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3512,6 +3554,15 @@ 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 ""
@@ -3581,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 ""
@@ -3638,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})"
@@ -3676,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}"
@@ -3813,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"
@@ -3888,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 ""
@@ -3918,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3945,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''"
@@ -4011,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 ""
@@ -4131,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"
@@ -4360,6 +4400,18 @@ 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 ""
@@ -4464,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 ""
@@ -4764,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"
@@ -4801,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"
@@ -4853,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 ""
@@ -5110,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 ""
@@ -5638,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5721,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 ""
@@ -5811,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 ""
@@ -5982,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 ""
@@ -6269,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"
@@ -6335,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"
@@ -6377,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)"
@@ -6537,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"
@@ -6855,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 ""
@@ -6986,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 ""
@@ -7010,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 ""
@@ -7123,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."
@@ -7222,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7309,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"
@@ -7328,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 ""
@@ -7394,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"
@@ -7470,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 ""
@@ -7485,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"
@@ -7701,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 "
@@ -7715,13 +7795,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7730,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 ""
@@ -7737,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 ..."
@@ -7850,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] ""
@@ -7862,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>"
@@ -7878,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:"
@@ -8024,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8054,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"
@@ -8407,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8428,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 ""
@@ -8485,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8551,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 ""
@@ -8734,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}''..."
@@ -8756,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"
@@ -8766,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:"
@@ -8987,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}''"
@@ -9702,6 +9811,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9770,6 +9912,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9823,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 ""
@@ -10279,6 +10429,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 ""
@@ -10342,7 +10498,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 ""
@@ -10600,40 +10756,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}''"
@@ -10686,8 +10842,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:"
@@ -10696,20 +10852,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 ""
@@ -10791,14 +10952,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,7 +11026,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10950,9 +11105,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10971,6 +11123,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 ""
@@ -11000,9 +11160,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 ""
@@ -11033,7 +11233,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 ""
@@ -11073,28 +11273,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..."
@@ -11189,6 +11387,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11204,12 +11405,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}."
@@ -11288,7 +11497,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11387,35 +11596,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 ""
@@ -11425,8 +11610,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 ..."
@@ -11453,10 +11638,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>"
@@ -11540,8 +11722,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}."
@@ -11738,7 +11920,7 @@ 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}"
@@ -11784,6 +11966,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."
@@ -11814,19 +12005,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 ""
@@ -11848,11 +12039,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 ""
@@ -11922,13 +12125,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}''"
@@ -12071,10 +12274,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"
@@ -12089,22 +12292,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}''"
@@ -12173,8 +12375,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..."
@@ -12189,9 +12390,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}''"
@@ -12513,12 +12729,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12529,30 +12744,73 @@ 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 "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] ""
+
+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"
@@ -12563,9 +12821,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."
@@ -12888,6 +13160,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 ""
@@ -13127,6 +13404,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."
@@ -13176,9 +13456,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 ""
@@ -13215,6 +13492,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 ""
@@ -13345,6 +13627,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13435,6 +13720,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 ""
@@ -13453,10 +13782,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 +13797,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13495,18 +13827,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 ""
@@ -13516,9 +13842,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13528,13 +13851,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13582,6 +13905,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13666,6 +13992,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13770,21 +14099,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 ""
@@ -13800,10 +14138,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"
@@ -13839,7 +14177,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13908,12 +14246,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 ""
@@ -13929,15 +14273,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 ""
@@ -13959,6 +14294,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13968,6 +14312,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13977,10 +14324,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14013,9 +14357,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14058,6 +14399,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14073,6 +14420,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14142,19 +14492,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14185,6 +14529,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14194,10 +14539,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14251,12 +14596,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14317,12 +14656,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14362,9 +14710,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14398,6 +14743,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 ""
@@ -14479,18 +14839,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 ""
@@ -14566,7 +14931,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14590,10 +14955,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"
@@ -14605,9 +14973,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14659,6 +15024,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14671,6 +15039,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14782,11 +15185,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14798,11 +15199,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14821,10 +15220,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14854,9 +15253,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14878,10 +15274,29 @@ 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"
@@ -15031,6 +15446,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15052,6 +15470,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15079,6 +15503,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15103,22 +15533,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 ""
@@ -15140,9 +15554,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15337,6 +15748,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15367,6 +15781,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15379,9 +15796,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15391,9 +15805,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15406,6 +15825,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15430,14 +15852,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15486,7 +15900,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15540,41 +15954,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"
@@ -15766,9 +16180,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15790,9 +16201,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15805,6 +16222,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15844,6 +16264,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15865,22 +16288,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"
@@ -16010,49 +16445,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"
@@ -16070,6 +16499,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16082,6 +16517,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16100,37 +16538,137 @@ 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"
@@ -16220,6 +16758,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 ""
@@ -16301,128 +16845,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16453,16 +17075,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16496,6 +17124,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16533,117 +17164,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 ""
@@ -16677,33 +17344,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 ""
@@ -16737,6 +17414,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 ""
@@ -16837,36 +17530,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 ""
@@ -16909,19 +17620,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 ""
@@ -17060,6 +17767,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 ""
@@ -17072,60 +17791,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 ""
@@ -17350,41 +18143,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"
@@ -17393,7 +18212,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17405,12 +18224,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 ""
@@ -17462,88 +18371,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17555,6 +18567,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 ""
@@ -17570,6 +18597,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17588,11 +18618,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17701,10 +18729,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17716,7 +18744,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17737,6 +18765,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17749,9 +18780,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17821,7 +18849,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17842,13 +18870,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"
@@ -17857,7 +18885,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17885,6 +18912,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17921,10 +18954,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"
@@ -17954,7 +19008,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17966,19 +19020,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"
@@ -18014,7 +19068,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18227,6 +19281,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18266,24 +19326,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 ""
@@ -18293,15 +19362,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18377,6 +19437,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18431,7 +19497,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18443,6 +19509,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18479,43 +19548,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18554,6 +19650,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18722,21 +19830,50 @@ 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 ""
+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 ""
@@ -18782,19 +19919,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"
@@ -18818,7 +19958,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18914,18 +20054,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 ""
@@ -18935,7 +20084,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18944,10 +20096,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18965,6 +20117,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18980,28 +20135,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"
@@ -19022,19 +20177,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"
@@ -19109,10 +20264,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19127,9 +20285,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19157,6 +20312,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19202,10 +20360,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"
@@ -19217,7 +20405,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"
@@ -19235,7 +20423,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19352,19 +20540,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 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"
@@ -19383,7 +20682,46 @@ 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 "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 "Landsat"
@@ -19395,19 +20733,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 "skobbler heatmap"
@@ -19428,7 +20775,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19437,6 +20784,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19583,6 +20933,29 @@ 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 ""
@@ -19748,6 +21121,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19793,6 +21169,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19979,19 +21388,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20015,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}''."
@@ -20284,10 +21699,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20491,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"
@@ -20762,15 +22180,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20941,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 ""
@@ -20959,12 +22371,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21100,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 ""
@@ -21117,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 ""
@@ -21343,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."
@@ -21393,7 +22808,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21578,6 +22993,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21617,27 +23097,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 ""
@@ -22715,9 +24177,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 ""
@@ -23364,9 +24843,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23419,18 +24895,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 ""
@@ -23777,6 +25241,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23928,6 +25413,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 ""
@@ -24245,9 +25733,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24463,6 +25948,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 ""
@@ -24495,15 +25983,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 ""
@@ -24618,9 +26122,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24799,19 +26300,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"
@@ -25027,6 +26528,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 ""
@@ -25063,6 +26653,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..."
@@ -25215,9 +26808,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26203,9 +27793,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26484,9 +28071,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 5c1381d..1f1fbe3 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-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-08-02 19:30+0000\n"
-"Last-Translator: Emre Sülün <emresulun93 at gmail.com>\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=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-08-05 05:03+0000\n"
-"X-Generator: Launchpad (build 16718)\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 "{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,9 @@ 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}"
@@ -59,6 +62,9 @@ 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."
@@ -164,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 "
@@ -230,7 +231,7 @@ msgid "Add layers"
msgstr "Katman ekle"
msgid "Invalid service URL."
-msgstr "Geçersiz servis URL'si"
+msgstr "Geçersiz servis URL''si"
msgid "WMS Error"
msgstr "WMS Hatası"
@@ -262,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"
@@ -301,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"
@@ -357,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"
@@ -538,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)"
@@ -658,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 ""
@@ -809,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"
@@ -994,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 ""
@@ -1017,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>"
@@ -1193,9 +1190,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1336,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"
@@ -1437,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)"
@@ -1720,6 +1735,9 @@ 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})"
@@ -1942,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] ""
@@ -2378,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 ""
@@ -2577,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 ""
@@ -2663,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"
@@ -2699,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"
@@ -2725,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}''"
@@ -2832,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] ""
@@ -2892,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"
@@ -2925,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"
@@ -2949,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 ""
@@ -2979,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 ""
@@ -2999,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 ""
@@ -3008,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 ""
@@ -3028,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}"
@@ -3059,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}''."
@@ -3216,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 ""
@@ -3324,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 ""
@@ -3362,9 +3385,6 @@ msgstr ""
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr "WGS84"
@@ -3405,6 +3425,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Adresler"
@@ -3429,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 ""
@@ -3488,6 +3520,9 @@ msgstr " veya "
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Çift Noktalar"
@@ -3570,6 +3605,15 @@ 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 ""
@@ -3639,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 ""
@@ -3697,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})"
@@ -3735,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}"
@@ -3880,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ı"
@@ -3955,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}"
@@ -3985,9 +4037,6 @@ msgstr "yapılar"
msgid "area"
msgstr "alan"
-msgid "Unclosed way"
-msgstr "Kapanmamış yollar"
-
msgid "Unconnected ways"
msgstr ""
@@ -4014,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 ""
@@ -4082,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 ""
@@ -4202,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"
@@ -4438,6 +4470,18 @@ 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"
@@ -4542,19 +4586,6 @@ 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 ""
@@ -4841,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"
@@ -4878,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"
@@ -4930,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 ""
@@ -5186,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 ""
@@ -5714,6 +5755,9 @@ msgstr "Göster/Sakla"
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5797,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"
@@ -5887,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 ""
@@ -6058,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 ""
@@ -6345,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"
@@ -6411,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"
@@ -6453,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 ""
@@ -6613,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"
@@ -6931,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"
@@ -7064,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, "
@@ -7088,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"
@@ -7204,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."
@@ -7303,6 +7374,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7390,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"
@@ -7409,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:"
@@ -7475,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"
@@ -7551,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 ""
@@ -7566,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"
@@ -7782,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 "
@@ -7796,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 ""
@@ -7811,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 ""
@@ -7818,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 ..."
@@ -7931,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] ""
@@ -7943,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>"
@@ -7959,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:"
@@ -8105,7 +8208,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8135,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"
@@ -8498,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..."
@@ -8519,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"
@@ -8576,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"
@@ -8646,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 ""
@@ -8832,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}''..."
@@ -8854,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"
@@ -8864,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:"
@@ -9089,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}''"
@@ -9600,7 +9701,7 @@ msgid "Configure toolbar"
msgstr ""
msgid "Edit shortcut"
-msgstr ""
+msgstr "Kısayol düzenle"
msgid "Do not hide toolbar and menu"
msgstr ""
@@ -9735,7 +9836,7 @@ msgid ""
msgstr ""
msgid "shortcut"
-msgstr ""
+msgstr "kısayol"
msgid "color"
msgstr ""
@@ -9809,6 +9910,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9877,6 +10011,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 ""
@@ -9930,6 +10067,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 ""
@@ -10389,6 +10531,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 ""
@@ -10452,8 +10600,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"
@@ -10710,21 +10858,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"
@@ -10746,6 +10879,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 ""
@@ -10796,8 +10944,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:"
@@ -10806,20 +10954,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 ""
@@ -10901,16 +11054,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 ""
@@ -10927,7 +11074,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."
@@ -10981,6 +11128,9 @@ msgstr ""
msgid "New relation"
msgstr ""
+msgid "Change Tags"
+msgstr ""
+
msgid "Change Properties"
msgstr "Özellikleri Değiştir"
@@ -11060,9 +11210,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr "Etiketteki özellikler okunamadı: {0}"
-
msgid "Error parsing {0}: "
msgstr "İşleme Hatası {0}: "
@@ -11081,6 +11228,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 ""
@@ -11110,9 +11265,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 "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 "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 ""
@@ -11143,7 +11338,7 @@ msgid "Contacting OSM Server..."
msgstr "OSM Server’ına Bağlanıyor..."
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 ""
@@ -11183,28 +11378,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..."
@@ -11303,6 +11496,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 ""
@@ -11318,12 +11514,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}."
@@ -11402,8 +11606,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!"
@@ -11501,35 +11705,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 ""
@@ -11539,8 +11719,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 ..."
@@ -11567,10 +11747,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>"
@@ -11654,8 +11831,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}."
@@ -11854,7 +12031,7 @@ 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}"
@@ -11900,6 +12077,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."
@@ -11930,19 +12116,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 ""
@@ -11964,11 +12150,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 ""
@@ -12038,13 +12236,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}''"
@@ -12187,10 +12385,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"
@@ -12205,22 +12403,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}''"
@@ -12292,8 +12489,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..."
@@ -12308,9 +12504,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}''"
@@ -12632,12 +12843,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12648,9 +12858,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 ""
@@ -12682,9 +12935,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."
@@ -13011,6 +13278,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 ""
@@ -13250,6 +13522,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."
@@ -13299,9 +13574,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 ""
@@ -13338,6 +13610,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 ""
@@ -13468,6 +13745,9 @@ msgstr "toprak set"
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "ücret"
+
msgid "Motorway Link"
msgstr "Araç yolu hattı"
@@ -13558,6 +13838,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"
@@ -13576,10 +13900,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"
@@ -13591,6 +13915,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Park alanı"
@@ -13618,18 +13945,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"
@@ -13639,9 +13960,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr "varış"
-
msgid "delivery"
msgstr ""
@@ -13651,15 +13969,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 ""
@@ -13705,6 +14023,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)"
@@ -13789,6 +14110,9 @@ msgstr "Köprü Düzenle"
msgid "viaduct"
msgstr "viyadük"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13893,21 +14217,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 ""
@@ -13923,10 +14256,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"
@@ -13962,7 +14295,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -14031,12 +14364,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 ""
@@ -14052,15 +14391,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 ""
@@ -14082,6 +14412,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr "Dur"
@@ -14091,6 +14430,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -14100,10 +14442,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14136,9 +14475,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr "Dönme Daire"
@@ -14181,6 +14517,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr "İzin verilen trafik:"
+msgid "Material"
+msgstr "Malzeme"
+
+msgid "stone"
+msgstr "taş"
+
msgid "Bollard"
msgstr "direk-iskele"
@@ -14196,6 +14538,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr "plastik"
+
msgid "Cycle Barrier"
msgstr ""
@@ -14265,19 +14610,16 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
-msgstr ""
-
-msgid "split_rail"
+msgid "pole"
msgstr ""
-msgid "chain"
+msgid "Guard Rail"
msgstr ""
-msgid "hedge"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14308,6 +14650,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14317,11 +14660,11 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
-msgstr "Giriş"
+msgid "Entrance (barrier opening)"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Giriş düzenle"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Geçit"
@@ -14374,12 +14717,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr "Malzeme"
-
-msgid "stone"
-msgstr "taş"
-
msgid "Turnstile"
msgstr ""
@@ -14440,12 +14777,21 @@ msgstr "kanalizasyon düzenle"
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr "dere"
msgid "Edit Stream"
msgstr "dere düzenle"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Kanal"
@@ -14485,9 +14831,6 @@ msgstr "Baraj düzenle"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14521,6 +14864,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"
@@ -14602,18 +14960,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 ""
@@ -14689,7 +15052,7 @@ msgstr "turizm"
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14713,10 +15076,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"
@@ -14728,9 +15094,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"
@@ -14782,6 +15145,9 @@ msgstr ""
msgid "Level Crossing"
msgstr "hemzemin geçit"
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14794,18 +15160,32 @@ msgstr ""
msgid "Barrier"
msgstr ""
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
msgid "half"
-msgstr "yarım"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "tam"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "double_half"
msgstr ""
msgid "Crossing"
msgstr "geçit"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14905,11 +15285,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14921,11 +15299,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14944,12 +15320,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 ""
@@ -14977,9 +15353,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "kapasite"
@@ -15001,10 +15374,29 @@ 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 "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"
@@ -15154,6 +15546,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr "Voltaj"
+
msgid "Amperage"
msgstr ""
@@ -15175,6 +15570,12 @@ msgstr "tamirci"
msgid "Edit Car Repair"
msgstr "tamirci düzenle"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15202,6 +15603,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ı"
@@ -15226,22 +15633,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 ""
@@ -15263,9 +15654,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Kıyafet"
@@ -15460,6 +15848,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15490,6 +15881,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "banket"
@@ -15502,9 +15896,6 @@ msgstr "tekerlekli sandalye"
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15514,9 +15905,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr "Bina"
@@ -15529,6 +15925,9 @@ msgstr "Metro Girişi Düzenle"
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15553,14 +15952,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"
@@ -15609,8 +16000,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ı"
@@ -15663,6 +16054,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 ""
@@ -15685,21 +16091,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 ""
@@ -15889,9 +16280,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr "Turizm"
@@ -15913,9 +16301,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 ""
@@ -15928,6 +16322,9 @@ msgstr "sokak"
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15967,6 +16364,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15988,22 +16388,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"
@@ -16133,50 +16545,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"
@@ -16193,6 +16599,12 @@ msgstr "katholik"
msgid "evangelical"
msgstr "protestan"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "yahova_şahitleri"
@@ -16205,6 +16617,9 @@ msgstr "methodist"
msgid "mormon"
msgstr "mormon"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "orthodox"
@@ -16223,39 +16638,139 @@ 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ı"
@@ -16343,6 +16858,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"
@@ -16424,55 +16945,139 @@ msgstr "Veteriner"
msgid "Edit Veterinary"
msgstr "Veteriner Düzenle"
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
-msgstr "Posta Kutusu"
-
-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 "Post Box"
+msgstr "Posta Kutusu"
+
+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 "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 ""
@@ -16500,8 +17105,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"
@@ -16527,21 +17132,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 "plastic"
-msgstr "plastik"
-
msgid "Amount of Seats"
msgstr ""
@@ -16576,8 +17175,17 @@ msgstr "Av Standı Düzenle"
msgid "Height"
msgstr "Yükseklik"
+msgctxt "height"
msgid "low"
-msgstr "alçak"
+msgstr ""
+
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
msgid "Hide"
msgstr "Sakla"
@@ -16585,9 +17193,6 @@ msgstr "Sakla"
msgid "Lock"
msgstr "Kilitle"
-msgid "Drinking Water"
-msgstr "İçme Suyu"
-
msgid "Edit Source of Potable Water"
msgstr ""
@@ -16619,6 +17224,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16656,119 +17264,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"
@@ -16800,26 +17444,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 ""
@@ -16827,6 +17472,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"
@@ -16860,6 +17514,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ışı"
@@ -16916,7 +17586,7 @@ msgid "Skating"
msgstr "patinaj"
msgid "Edit Skating"
-msgstr "patinaj düzenle"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -16960,36 +17630,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 ""
@@ -17032,19 +17720,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 ""
@@ -17183,6 +17867,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 ""
@@ -17195,60 +17891,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"
@@ -17473,41 +18243,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"
@@ -17516,8 +18312,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"
@@ -17528,12 +18324,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ü"
@@ -17585,89 +18471,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"
@@ -17678,6 +18667,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 ""
@@ -17693,6 +18697,9 @@ msgstr "güç Kulesi Düzenle"
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17711,11 +18718,9 @@ msgstr "Güç Hattı Düzenle"
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17824,11 +18829,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"
@@ -17839,7 +18844,7 @@ msgstr "kasap düzenle"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17860,6 +18865,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17872,9 +18880,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17944,7 +18949,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17965,13 +18970,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"
@@ -17980,7 +18985,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -18008,6 +19012,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 ""
@@ -18044,10 +19054,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"
@@ -18077,7 +19108,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18089,19 +19120,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"
@@ -18137,7 +19168,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18350,6 +19381,12 @@ msgstr "Zirve"
msgid "Edit Peak"
msgstr "Zirve Düzenle"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Buzul"
@@ -18389,26 +19426,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"
@@ -18416,15 +19462,6 @@ 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 ""
@@ -18500,6 +19537,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Bağ"
@@ -18554,8 +19597,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"
@@ -18566,6 +19609,9 @@ msgstr "Mezarlık"
msgid "Edit Graveyard"
msgstr "Mezarlık Düzenle"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Mezarlık"
@@ -18635,10 +19681,37 @@ msgstr "Toprak Dolum Alanı Düzenle"
msgid "Quarry"
msgstr "Taşocağı"
-msgid "Edit Quarry Landuse"
-msgstr "taşocağı Düzenle"
+msgid "Edit Quarry Landuse"
+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 "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18677,6 +19750,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 ""
@@ -18845,21 +19930,50 @@ 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 "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 ""
@@ -18905,19 +20019,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"
@@ -18941,7 +20058,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -19037,18 +20154,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"
@@ -19058,8 +20184,11 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
-msgstr "araçyolu_hattı"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr ""
@@ -19067,10 +20196,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -19088,6 +20217,9 @@ msgstr ""
msgid "railwaypoint"
msgstr "demiryolu_noktası"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19103,29 +20235,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üç"
@@ -19145,20 +20277,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"
@@ -19232,10 +20364,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"
@@ -19250,9 +20385,6 @@ msgstr "Köy/Şehir"
msgid "One Way"
msgstr "tek Yol"
-msgid "Church"
-msgstr "klise"
-
msgid "Fuel Station"
msgstr "Benzin İstasyonu"
@@ -19280,6 +20412,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19325,10 +20460,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"
@@ -19340,7 +20505,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"
@@ -19358,7 +20523,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19475,19 +20640,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 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"
@@ -19506,7 +20782,46 @@ 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 "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 "Landsat"
@@ -19518,19 +20833,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 "skobbler heatmap"
@@ -19551,7 +20875,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19560,6 +20884,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19706,6 +21033,29 @@ 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 ""
@@ -19871,6 +21221,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19916,6 +21269,39 @@ msgstr ""
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 "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 ""
@@ -20114,7 +21500,19 @@ msgstr "İzleri openstreetmap.org sitesine yükle"
msgid "Shows elevation profile"
msgstr ""
-msgid "Elevation Profile"
+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."
@@ -20138,13 +21536,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20407,10 +21799,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20614,7 +22009,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"
@@ -20885,15 +22280,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -21064,6 +22450,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 ""
@@ -21082,12 +22471,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21223,6 +22606,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 ""
@@ -21240,6 +22626,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 ""
@@ -21466,7 +22855,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."
@@ -21516,7 +22908,7 @@ msgstr "Seçili şemayı sil."
msgid "Color Schemes"
msgstr "Renk Şeması"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21701,6 +23093,71 @@ msgstr ""
msgid "Show users on map"
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 "Pozisyon Sadece"
@@ -21740,27 +23197,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."
@@ -22850,9 +24289,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 ""
@@ -23501,9 +24957,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 "Process queue"
msgstr ""
@@ -23556,18 +25009,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 ""
@@ -23916,6 +25357,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -24067,6 +25529,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 ""
@@ -24277,7 +25742,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ı"
@@ -24384,9 +25849,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24602,6 +26064,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 ""
@@ -24634,15 +26099,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 ""
@@ -24757,9 +26238,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr "Otoyol tipi"
-
msgid "Speed (Km/h)"
msgstr "Hız (Km/h)"
@@ -24938,19 +26416,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"
@@ -25166,6 +26644,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 ""
@@ -25202,6 +26769,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..."
@@ -25354,9 +26924,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr "Doğruluk"
-
msgid "Select as much as you like:"
msgstr ""
@@ -26340,9 +27907,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26580,10 +28144,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 ""
@@ -26592,7 +28156,7 @@ msgid "coordinates"
msgstr ""
msgid "Category"
-msgstr ""
+msgstr "Kategori"
msgid "Fetches a list of all Wikipedia articles of a category"
msgstr ""
@@ -26601,7 +28165,7 @@ msgid "Enter the Wikipedia category"
msgstr ""
msgid "Clipboard"
-msgstr ""
+msgstr "Pano"
msgid "Pastes Wikipedia articles from the system clipboard"
msgstr ""
@@ -26621,9 +28185,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 7031b89..5848a08 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-08-04 03:41+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-08-05 05:03+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 ""
@@ -250,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -289,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -343,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 ""
@@ -523,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -636,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 ""
@@ -786,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"
@@ -972,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 ""
@@ -995,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>"
@@ -1163,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1304,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"
@@ -1399,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 ""
@@ -1683,6 +1703,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1902,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] ""
@@ -2328,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 ""
@@ -2524,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 ""
@@ -2611,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 ""
@@ -2647,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"
@@ -2673,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}''"
@@ -2778,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] ""
@@ -2838,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"
@@ -2869,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"
@@ -2893,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 ""
@@ -2923,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 ""
@@ -2943,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 ""
@@ -2952,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 ""
@@ -2972,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}"
@@ -3003,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}''."
@@ -3160,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 ""
@@ -3268,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 ""
@@ -3306,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3347,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3371,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 ""
@@ -3430,6 +3469,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3512,6 +3554,15 @@ 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 ""
@@ -3581,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 ""
@@ -3638,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})"
@@ -3676,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}"
@@ -3813,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"
@@ -3888,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 ""
@@ -3918,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3945,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''"
@@ -4011,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 ""
@@ -4131,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"
@@ -4360,6 +4400,18 @@ 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 ""
@@ -4464,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 ""
@@ -4764,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"
@@ -4801,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"
@@ -4853,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 ""
@@ -5110,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 ""
@@ -5638,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5721,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 ""
@@ -5811,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 ""
@@ -5982,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 ""
@@ -6269,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"
@@ -6335,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"
@@ -6377,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)"
@@ -6537,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"
@@ -6855,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 ""
@@ -6986,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 ""
@@ -7010,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 ""
@@ -7123,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."
@@ -7222,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7309,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"
@@ -7328,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 ""
@@ -7394,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"
@@ -7470,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 ""
@@ -7485,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"
@@ -7701,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 "
@@ -7715,13 +7795,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7730,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 ""
@@ -7737,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 ..."
@@ -7850,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] ""
@@ -7862,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>"
@@ -7878,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:"
@@ -8024,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8054,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"
@@ -8407,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8428,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 ""
@@ -8485,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8551,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 ""
@@ -8734,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}''..."
@@ -8756,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"
@@ -8766,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:"
@@ -8987,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}''"
@@ -9702,6 +9811,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9770,6 +9912,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9823,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 ""
@@ -10279,6 +10429,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 ""
@@ -10342,7 +10498,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 ""
@@ -10600,40 +10756,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}''"
@@ -10686,8 +10842,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:"
@@ -10696,20 +10852,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 ""
@@ -10791,14 +10952,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,7 +11026,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10950,9 +11105,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10971,6 +11123,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 ""
@@ -11000,9 +11160,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 ""
@@ -11033,7 +11233,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 ""
@@ -11073,28 +11273,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..."
@@ -11189,6 +11387,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11204,12 +11405,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}."
@@ -11288,7 +11497,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11387,35 +11596,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 ""
@@ -11425,8 +11610,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 ..."
@@ -11453,10 +11638,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>"
@@ -11540,8 +11722,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}."
@@ -11738,7 +11920,7 @@ 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}"
@@ -11784,6 +11966,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."
@@ -11814,19 +12005,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 ""
@@ -11848,11 +12039,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 ""
@@ -11922,13 +12125,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}''"
@@ -12071,10 +12274,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"
@@ -12089,22 +12292,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}''"
@@ -12173,8 +12375,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..."
@@ -12189,9 +12390,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}''"
@@ -12513,12 +12729,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12529,30 +12744,73 @@ 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 "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] ""
+
+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"
@@ -12563,9 +12821,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."
@@ -12888,6 +13160,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 ""
@@ -13127,6 +13404,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."
@@ -13176,9 +13456,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 ""
@@ -13215,6 +13492,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 ""
@@ -13345,6 +13627,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13435,6 +13720,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 ""
@@ -13453,10 +13782,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 +13797,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13495,18 +13827,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 ""
@@ -13516,9 +13842,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13528,13 +13851,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13582,6 +13905,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13666,6 +13992,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13770,21 +14099,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 ""
@@ -13800,10 +14138,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"
@@ -13839,7 +14177,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13908,12 +14246,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 ""
@@ -13929,15 +14273,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 ""
@@ -13959,6 +14294,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13968,6 +14312,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13977,10 +14324,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14013,9 +14357,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14058,6 +14399,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14073,6 +14420,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14142,19 +14492,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14185,6 +14529,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14194,10 +14539,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14251,12 +14596,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14317,12 +14656,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14362,9 +14710,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14398,6 +14743,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 ""
@@ -14479,18 +14839,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 ""
@@ -14566,7 +14931,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14590,10 +14955,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"
@@ -14605,9 +14973,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14659,6 +15024,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14671,6 +15039,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14782,11 +15185,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14798,11 +15199,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14821,10 +15220,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14854,9 +15253,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14878,10 +15274,29 @@ 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"
@@ -15031,6 +15446,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15052,6 +15470,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15079,6 +15503,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15103,22 +15533,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 ""
@@ -15140,9 +15554,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15337,6 +15748,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15367,6 +15781,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15379,9 +15796,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15391,9 +15805,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15406,6 +15825,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15430,14 +15852,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15486,7 +15900,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15540,41 +15954,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"
@@ -15766,9 +16180,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15790,9 +16201,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15805,6 +16222,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15844,6 +16264,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15865,22 +16288,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"
@@ -16010,49 +16445,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"
@@ -16070,6 +16499,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16082,6 +16517,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16100,37 +16538,137 @@ 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"
@@ -16220,6 +16758,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 ""
@@ -16301,128 +16845,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16453,16 +17075,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16496,6 +17124,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16533,117 +17164,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 ""
@@ -16677,33 +17344,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 ""
@@ -16737,6 +17414,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 ""
@@ -16837,36 +17530,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 ""
@@ -16909,19 +17620,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 ""
@@ -17060,6 +17767,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 ""
@@ -17072,60 +17791,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 ""
@@ -17350,41 +18143,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"
@@ -17393,7 +18212,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17405,12 +18224,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 ""
@@ -17462,88 +18371,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17555,6 +18567,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 ""
@@ -17570,6 +18597,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17588,11 +18618,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17701,10 +18729,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17716,7 +18744,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17737,6 +18765,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17749,9 +18780,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17821,7 +18849,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17842,13 +18870,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"
@@ -17857,7 +18885,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17885,6 +18912,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17921,10 +18954,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"
@@ -17954,7 +19008,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17966,19 +19020,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"
@@ -18014,7 +19068,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18227,6 +19281,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18266,24 +19326,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 ""
@@ -18293,15 +19362,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18377,6 +19437,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18431,7 +19497,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18443,6 +19509,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18479,43 +19548,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18554,6 +19650,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18722,21 +19830,50 @@ 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 ""
+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 ""
@@ -18782,19 +19919,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"
@@ -18818,7 +19958,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18914,18 +20054,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 ""
@@ -18935,7 +20084,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18944,10 +20096,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18965,6 +20117,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18980,28 +20135,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"
@@ -19022,19 +20177,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"
@@ -19109,10 +20264,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19127,9 +20285,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19157,6 +20312,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19202,10 +20360,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"
@@ -19217,7 +20405,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"
@@ -19235,7 +20423,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19352,19 +20540,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 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"
@@ -19383,7 +20682,46 @@ 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 "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 "Landsat"
@@ -19395,19 +20733,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 "skobbler heatmap"
@@ -19428,7 +20775,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19437,6 +20784,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19583,6 +20933,29 @@ 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 ""
@@ -19748,6 +21121,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19793,6 +21169,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19979,19 +21388,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20015,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}''."
@@ -20284,10 +21699,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20491,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"
@@ -20762,15 +22180,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20941,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 ""
@@ -20959,12 +22371,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21100,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 ""
@@ -21117,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 ""
@@ -21343,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."
@@ -21393,7 +22808,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21578,6 +22993,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21617,27 +23097,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 ""
@@ -22715,9 +24177,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 ""
@@ -23364,9 +24843,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23419,18 +24895,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 ""
@@ -23777,6 +25241,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23928,6 +25413,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 ""
@@ -24245,9 +25733,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24463,6 +25948,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 ""
@@ -24495,15 +25983,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 ""
@@ -24618,9 +26122,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24799,19 +26300,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"
@@ -25027,6 +26528,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 ""
@@ -25063,6 +26653,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..."
@@ -25215,9 +26808,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26203,9 +27793,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26484,9 +28071,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 f425733..aad116a 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-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-08-26 14:15+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-08-27 04:32+0000\n"
-"X-Generator: Launchpad (build 16738)\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,9 @@ msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
"Відкриття посилання, що не підтримується поточною платформою (''{0}'')"
+msgid "ERROR: {0}"
+msgstr "ПОМИЛКА: {0}"
+
msgid "WARNING: {0}"
msgstr "ПОПЕРЕДЖЕННЯ: {0}"
@@ -61,6 +64,9 @@ msgstr "ІНФОРМАЦІЯ: {0}"
msgid "DEBUG: {0}"
msgstr "ВІДЛАГОДЖЕННЯ: {0}"
+msgid "Cause: "
+msgstr "Причина: "
+
msgid "Executing platform startup hook"
msgstr "Виконання стартових процедур"
@@ -165,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 "
@@ -269,9 +276,6 @@ msgstr "Інструмент: {0}"
msgid "Please select at least four nodes."
msgstr "Будь ласка, виберіть щонайменше чотири точки."
-msgid "Information"
-msgstr "Інформація"
-
msgid "Align Nodes in Line"
msgstr "Вирівняти точки в одну лінію"
@@ -308,6 +312,9 @@ msgstr "наступного"
msgid "Nothing selected to zoom to."
msgstr "Нічого не виділено для масштабування"
+msgid "Information"
+msgstr "Інформація"
+
msgid "Zoom to {0}"
msgstr "Масштабувати до {0}"
@@ -364,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} шт."
@@ -554,6 +562,9 @@ msgstr "Історія"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Показати історію лінії, точки або зв’язку OSM"
+msgid "Show history"
+msgstr "Показати історію"
+
msgid "History (web)"
msgstr "Історія (веб)"
@@ -676,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 "Виправити конфлікти теґів"
@@ -848,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 "Скасувати об’єднання"
@@ -1066,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 "
@@ -1096,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>"
@@ -1281,9 +1284,6 @@ msgstr "Завантажити сеанс"
msgid "Load a session from file."
msgstr "Завантажити сеанс з файлу."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Файл сеансу (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Відрити сеанс"
@@ -1441,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} частин"
@@ -1556,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 "Відмінити"
@@ -1854,6 +1876,9 @@ 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} лишилось)"
@@ -2105,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 "Неможливо вилучити точку пов’язану із багатьма об’єктами"
@@ -2431,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 для нових об’єктів)"
@@ -2581,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 "комбінатори"
@@ -2624,7 +2652,7 @@ msgid "metadata"
msgstr "метадані"
msgid "objects changed by user"
-msgstr "об’єкти змінені користувачем"
+msgstr "об’єкти змінені учасником"
msgid "objects with given ID"
msgstr "об’єкти із вказаними ID"
@@ -2790,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 "
@@ -2889,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}"
@@ -2925,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}\" для"
@@ -2954,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}''"
@@ -3082,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} точку"
@@ -3156,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 "Зв’язок"
@@ -3189,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 "Ролі в зв’язках, що відносяться до"
@@ -3215,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}"
@@ -3248,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 "
@@ -3272,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 "
@@ -3285,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 "
@@ -3313,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}"
@@ -3348,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}''"
@@ -3523,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."
@@ -3638,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)"
@@ -3679,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"
@@ -3722,6 +3746,9 @@ msgstr "інше при перевірці"
msgid "Running test {0}"
msgstr "Виконується тест {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr "Перевірку ''{0}'' завершено за {1}"
+
msgid "Addresses"
msgstr "Адреси"
@@ -3746,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 "Будівля в сердені будівлі"
@@ -3807,6 +3843,9 @@ msgstr " чи "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0} заборонено, використовуйте {1} замість цього"
+msgid "{0} is unnecessary"
+msgstr "{0} не є потрібними"
+
msgid "Duplicated nodes"
msgstr "Подвійні точки"
@@ -3893,6 +3932,15 @@ 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 "Мультиполігон"
@@ -3965,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 "Полігони, що перекриваються"
@@ -4024,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})"
@@ -4064,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}"
@@ -4207,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 "Неможливо знайти тип елементу"
@@ -4283,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}"
@@ -4313,9 +4372,6 @@ msgstr "будівля"
msgid "area"
msgstr "полігон"
-msgid "Unclosed way"
-msgstr "Незамкнена лінія"
-
msgid "Unconnected ways"
msgstr "Нез’єднана лінія"
@@ -4343,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''"
@@ -4411,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 "Не показувати знову (запам’ятати вибір)"
@@ -4536,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 "Повідомлення дня недоступне"
@@ -4792,6 +4828,18 @@ 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 "Звук"
@@ -4898,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} мс)"
@@ -5225,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."
@@ -5232,6 +5270,9 @@ msgstr ""
"Копіювати мої виділені елементи перед першим виділеним елементом у списку "
"об’єднаних елементів."
+msgid "> after"
+msgstr "> після"
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -5239,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."
@@ -5256,6 +5306,9 @@ msgstr ""
"Скопіювати чужі виділені елементи перед першим виділеним елементом у списку "
"об’єднаних елементів."
+msgid "< after"
+msgstr "< після"
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -5272,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 "Вниз"
@@ -5331,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 "Точка"
@@ -5621,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 ""
@@ -6213,6 +6256,9 @@ msgstr "Показати/сховати"
msgid "Information about layer"
msgstr "Інформація про шар"
+msgid "Map paint preferences"
+msgstr "Налаштування кольорів мапи"
+
msgid "Map Paint Styles"
msgstr "Стиль кольорів мапи"
@@ -6297,6 +6343,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 "Ідентифікатор об’єкту:"
+
+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 "Зв’язки"
@@ -6385,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 "
@@ -6510,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>"
@@ -6568,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 "Завантажити та показати історію виділених об’єктів"
@@ -6698,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 "Виберіть набори змін залежно від того, відкриті вони або закриті"
@@ -6723,7 +6797,7 @@ msgid "Query both open and closed changesets"
msgstr "Отримати відкриті та закриті набори змін"
msgid "User ID:"
-msgstr "Ід. користувача:"
+msgstr "Ід. учасника:"
msgid "User name:"
msgstr "Ім’я користувача:"
@@ -6732,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 "
@@ -6752,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 "Дата: "
@@ -6830,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"
@@ -6840,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: "
@@ -6889,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>"
@@ -6905,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 ""
@@ -6977,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 "Змінити зв’язок"
@@ -7019,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)"
@@ -7191,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"
@@ -7545,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 "Закладки"
@@ -7695,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, "
@@ -7721,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 "Тип класу"
@@ -7855,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 порожній."
@@ -7964,6 +8038,9 @@ msgid ""
msgstr ""
"<html>Версію <strong>{0}</strong> створено у <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr "Коментар набору змін"
+
msgid "Changeset info"
msgstr "Інформація набору змін"
@@ -8074,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 "Надіслати"
@@ -8098,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 "Набір змін:"
@@ -8170,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"
@@ -8258,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 "
@@ -8272,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 "Завантаження об’єктів"
@@ -8539,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 "
@@ -8554,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 ""
"Повернутись до попереднього вікна, щоб ввести більш докладний коментар"
@@ -8575,19 +8668,40 @@ msgstr "Будь ласка, спочатку введіть вірний роз
msgid "Illegal chunk size"
msgstr "Невірний розмір порції"
-msgid "Cancel the upload and resume editing"
-msgstr "Відмінити надсилання даний та повернутись до редагування"
-
-msgid "Tags of changeset {0}"
-msgstr "Теґи набору змін {0}"
+msgid "{0}={1}"
+msgstr "{0}={1}"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
-msgstr ""
-"Попередження: об’єкт ''{0}'' вилучений на сервері. Дані будуть знову "
-"надіслані на сервер, але без цього об’єкта."
-
+"<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 "Відмінити надсилання даний та повернутись до редагування"
+
+msgid "Tags of changeset {0}"
+msgstr "Теґи набору змін {0}"
+
+msgid ""
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
+msgstr ""
+"Об’єкт ''{0}'' вилучено на сервері. Пропускаємо його та намагаємось "
+"повторити надсилання."
+
msgid "Preparing objects to upload ..."
msgstr "Підготування об’єктів до надсилання…"
@@ -8733,9 +8847,6 @@ msgstr ""
"Об’єкт ''{0}'' вилучений. Об’єкт буде пропущено під час надсилання даних на "
"сервер."
-msgid "Warning: {0}"
-msgstr "Попередження: {0}"
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Надсилання {0} об’єкту…"
@@ -8748,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>"
@@ -8768,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 "Будь ласка, виберіть стратегію надсилання:"
@@ -8931,7 +9043,7 @@ msgstr "Наступна мітка"
msgid "Jump to next marker"
msgstr "Перейти до наступного маркера"
-msgid "Previos marker"
+msgid "Previous marker"
msgstr "Попередня мітка"
msgid "Jump to previous marker"
@@ -8953,7 +9065,7 @@ msgid "Save Layer"
msgstr "Зберегти шар"
msgid "Data Layer {0}"
-msgstr "Шар даних {0}"
+msgstr "Дані {0}"
msgid "outside downloaded area"
msgstr "по-за межами завантаженої ділянки"
@@ -8964,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"
@@ -9344,9 +9457,6 @@ msgstr "Видобування координат GPS з EXIF"
msgid "Starting directory scan"
msgstr "Запуск сканування каталогу"
-msgid "One of the selected files was null"
-msgstr "Один з виділених файлів порожній"
-
msgid "Read photos..."
msgstr "Переглянути фотографії…"
@@ -9365,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 "Зображення з геотеґами"
@@ -9426,6 +9539,12 @@ msgstr "Наступне"
msgid "Show next Image"
msgstr "Показати наступне зображення"
+msgid "Show first Image"
+msgstr "Показати перше зображення"
+
+msgid "Show last Image"
+msgstr "Показати останнє зображення"
+
msgid "Center view"
msgstr "Центрувати вид"
@@ -9509,9 +9628,6 @@ msgstr ""
"вважається шкідливим.<br>Якщо хочете завантажити треки, ознайомтеся з "
"цим:</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr "Налаштування креслення треків"
@@ -9712,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}''…"
@@ -9742,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 "Невірний шаблон переривчастою лінії, значення має бути позитивним"
@@ -9754,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 "Ключ мітки доступу:"
@@ -10022,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}''"
@@ -10654,7 +10763,7 @@ msgid ""
"programs."
msgstr ""
"Перевірка даних OSM, яка перевіряє наявність загальних помилок, що "
-"здійснюються користувачами та програмами-редакторами."
+"здійснюються учасниками та програмами-редакторами."
msgid "Use ignore list."
msgstr "Використовувати список ігнорування."
@@ -10812,6 +10921,41 @@ 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 "Змінити праметри рядка"
+
+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: NonDefalut"
msgstr "Розширене значення фону: Нетиповий"
@@ -10882,6 +11026,9 @@ msgstr "Показувати віртуальні точки в режимі в
msgid "Draw inactive layers in other color"
msgstr "Показувати неактивні шари іншим кольором"
+msgid "Display discardable keys"
+msgstr "Показувати застарілі теґи"
+
msgid "Highlight target ways and nodes"
msgstr "Підсвічувати лінії та точки"
@@ -10942,6 +11089,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 "Параметри, що впливають на швидкодію"
@@ -11434,6 +11588,12 @@ msgstr ""
"<i>(JOSM може залишати резервні копії зберігаючи шари з даними. Він додає до "
"їх назви ''~'' та зберігає у ту ж саму теку.)</i>"
+msgid "Notification at each save"
+msgstr "Повідомлення при кожному збереженні"
+
+msgid "When saving, display a small notification"
+msgstr "Під час збереження показувати невеличке повідомлення"
+
msgid "File backup"
msgstr "Резервне копіювання файлів"
@@ -11503,8 +11663,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"
@@ -11786,21 +11946,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"
@@ -11822,6 +11967,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}''"
@@ -11886,11 +12046,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:"
@@ -11898,29 +12058,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. "
@@ -12012,17 +12169,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 "Фонова комбінація: Користувач"
@@ -12096,8 +12248,8 @@ msgstr "Застосувати заготовку"
msgid "New relation"
msgstr "Новий зв’язок"
-msgid "Change Properties"
-msgstr "Змінити параметри"
+msgid "Change Tags"
+msgstr "Змінити теґи"
msgid "Unknown requisite: {0}"
msgstr "Невідомий запит: {0}"
@@ -12185,9 +12337,6 @@ msgstr "Роль елемента заготовки без батьків"
msgid "Preset sub element without parent"
msgstr "Вкладені елементи заготовок без батьків"
-msgid "Could not read tagging preset source: {0}"
-msgstr "Неможливо прочитати з джерела заготовок теґів: {0}"
-
msgid "Error parsing {0}: "
msgstr "Помилка синтаксичного аналізу: {0} "
@@ -12206,6 +12355,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 "Усі файли (*.*)"
@@ -12240,9 +12399,57 @@ msgstr ""
"Поточне значення не є допустимим ідентифікатором OSM. Будь ласка, введіть "
"ціле число > 0"
+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 ""
+"Неприпустиме значення обов’язкового атрибуту ''{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 ""
@@ -12279,11 +12486,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}''."
@@ -12327,39 +12534,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 "Розбір відповіді від сервера…"
@@ -12461,6 +12664,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}."
@@ -12476,15 +12682,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}."
@@ -12571,8 +12786,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!"
@@ -12681,47 +12896,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 "
@@ -12731,11 +12914,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 "Розбір вмісту набору змін…"
@@ -12763,13 +12946,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>"
@@ -12861,11 +13039,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}."
@@ -12963,7 +13141,7 @@ msgstr ""
"Неприпустиме значення атрибуту ''{0}'' у XML-теґа ''{1}''. Отримано {2}."
msgid "Reading user info ..."
-msgstr "Читання інформації про користувача…"
+msgstr "Читання інформації про учасника…"
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -13074,10 +13252,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 "RemoteControl::Встановлення з’єднання на порту {0}"
+
+msgid "RemoteControl::Server stopped."
+msgstr "RemoteControl::Сервер зупинено."
msgid "RemoteControl::Accepting connections on port {0}"
msgstr "RemoteControl::Встановлення з’єднання на порту {0}"
@@ -13129,6 +13311,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 "Широта повинна бути між {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."
@@ -13165,20 +13356,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: "
@@ -13202,12 +13393,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}''."
@@ -13283,18 +13486,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}''"
@@ -13468,11 +13671,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 "Вимкнути втулок"
@@ -13486,29 +13689,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}''"
@@ -13583,11 +13784,10 @@ 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 "Обробка файлів значків втулків з кешу сайта…"
@@ -13601,12 +13801,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}''"
@@ -14089,15 +14304,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 "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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
-"Попередження: не вдалося отримати доступ до каталогу ''{0}'' з міркувань "
-"безпеки. Помилка: {1}"
+"Не вдалось отримати доступ до теки ''{0}'' з причин безпеки. Виключення: {1}"
msgid "{0}... [please type its number]"
msgstr "{0}… [вкажіть номер]"
@@ -14109,9 +14322,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}''."
@@ -14147,8 +14407,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 "
@@ -14494,6 +14769,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 ""
@@ -14805,6 +15087,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."
@@ -14865,9 +15150,6 @@ msgstr ""
"можна обмежити максимально допустимим розміром полігону, а також кількістю "
"прилеглих точок."
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr "Створення та редагування морських мап для OpenSeaMap"
-
msgid "Edit features for OpenSeaMap"
msgstr "Редагування об’єктів OpenSeaMap"
@@ -14914,6 +15196,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"
@@ -15055,6 +15344,9 @@ msgstr "Насип"
msgid "Lit"
msgstr "Освітлення"
+msgid "Toll"
+msgstr "Платна"
+
msgid "Motorway Link"
msgstr "З’їзд з/на Автомагістраль"
@@ -15145,6 +15437,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 "Житлова зона"
@@ -15163,11 +15499,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 "провулок"
@@ -15178,6 +15514,9 @@ msgstr "під’їзна дорога"
msgid "parking_aisle"
msgstr "проїзд на стоянці"
+msgid "drive-through"
+msgstr "обслуговування автомобілістів"
+
msgid "Parking Aisle"
msgstr "Проїзд на стоянці"
@@ -15205,18 +15544,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 "Глухий кут"
@@ -15226,9 +15559,6 @@ msgstr "Обмеження за типами транспорту"
msgid "General Access"
msgstr "Загальний доступ"
-msgid "destination"
-msgstr "за призначенням"
-
msgid "delivery"
msgstr "для доставки товарів"
@@ -15238,15 +15568,15 @@ msgstr "дозволено власником"
msgid "private"
msgstr "приватна"
+msgid "customers"
+msgstr "клієнти"
+
msgid "agricultural"
msgstr "сільськогосподарського призначення"
msgid "forestry"
msgstr "для транспорту лісництва"
-msgid "no"
-msgstr "ні"
-
msgid "official"
msgstr "офіційно"
@@ -15292,6 +15622,9 @@ msgstr "Автомобілі з пасажирами"
msgid "Public Service Vehicles (psv)"
msgstr "Громадський транспорт"
+msgid "Tourist buses"
+msgstr "Туристичні автобуси"
+
msgid "Min. speed (km/h)"
msgstr "Мін. швидкість (км/г)"
@@ -15376,6 +15709,9 @@ msgstr "Властивості Мосту"
msgid "viaduct"
msgstr "віадук"
+msgid "suspension"
+msgstr "підвісний"
+
msgid "swing"
msgstr "розвідний"
@@ -15392,10 +15728,10 @@ msgid "Ways"
msgstr "Шляхи"
msgid "Track"
-msgstr "Ґрунтовка"
+msgstr "Путівець"
msgid "Edit Track"
-msgstr "Властивості Ґрунтовки"
+msgstr "Властивості Путівця"
msgid "Tracktype"
msgstr "Дорожнє покриття"
@@ -15494,20 +15830,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 "Інвалідним візком"
@@ -15524,14 +15869,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 "смуга"
@@ -15555,16 +15900,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 "Дорога"
@@ -15632,12 +15977,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 "Тип пішохідного переходу"
@@ -15653,15 +16004,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 "Тип перехода (В.Британія)"
@@ -15683,6 +16025,15 @@ msgstr "pegasus (для вершників)"
msgid "tiger"
msgstr "tiger (нерегульований вело-пішохідний)"
+msgid "Crossing attendant"
+msgstr "Під наглядом регулювальника"
+
+msgid "Cross by bicycle"
+msgstr "Дозволено переїзд велосипедом"
+
+msgid "Cross on horseback"
+msgstr "Дозволено переїзд верхи"
+
msgid "Stop"
msgstr "Стоп"
@@ -15692,6 +16043,9 @@ msgstr "Дати дорогу"
msgid "Mini-roundabout"
msgstr "Міні-круг"
+msgid "Edit Mini-Roundabout"
+msgstr "Властивості міні-круга"
+
msgid "Direction"
msgstr "Напрямок"
@@ -15701,11 +16055,8 @@ msgstr "за годинниковою стрілкою"
msgid "Pedestrian Crossing"
msgstr "Пішохідний перехід"
-msgid "Edit Crossing"
-msgstr "Властивості Пішохідного переходу"
-
-msgid "Type name (UK)"
-msgstr "Назва типи (В.Брит)"
+msgid "Edit Pedestrian Crossing"
+msgstr "Властивості пішохідного переходу"
msgid "Traffic Calming"
msgstr "Засоби для обмеження швидкості"
@@ -15737,9 +16088,6 @@ msgstr "платформа"
msgid "Passing Place"
msgstr "Місце роз’їзду"
-msgid "Edit Passing Place"
-msgstr "Властивості Місця роз’їзду"
-
msgid "Turning Circle"
msgstr "Круг для розвороту"
@@ -15782,6 +16130,12 @@ msgstr "Властивості блоку"
msgid "Allowed traffic:"
msgstr "Дозволено пересування:"
+msgid "Material"
+msgstr "Матеріал"
+
+msgid "stone"
+msgstr "камінь"
+
msgid "Bollard"
msgstr "Стовпчик"
@@ -15797,6 +16151,9 @@ msgstr "піднімається"
msgid "removable"
msgstr "знімний"
+msgid "plastic"
+msgstr "пластик"
+
msgid "Cycle Barrier"
msgstr "Перешкода для велосипедів"
@@ -15866,20 +16223,17 @@ msgstr "сітка рабиця"
msgid "electric"
msgstr "електрика"
-msgid "roundpole"
-msgstr "палиці"
-
-msgid "split_rail"
-msgstr "штахетник"
+msgid "pole"
+msgstr "стовп"
-msgid "chain"
-msgstr "сітка рабиця"
+msgid "Guard Rail"
+msgstr "Захисна огорожа"
-msgid "hedge"
-msgstr "тин"
+msgid "Edit Guard Rail"
+msgstr "Властивості Захисної огорожі"
-msgid "pole"
-msgstr "стовп"
+msgid "wire"
+msgstr "дріт"
msgid "Guard Rail"
msgstr "Захисна огорожа"
@@ -15909,6 +16263,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr "Канава"
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr "Властивості Канави"
@@ -15918,11 +16273,11 @@ msgstr "Бордюр"
msgid "Edit Kerb"
msgstr "Властивості Бордюру"
-msgid "Entrance"
-msgstr "Вхід/В’їзд"
+msgid "Entrance (barrier opening)"
+msgstr "Прохід (в огорожі)"
-msgid "Edit Entrance"
-msgstr "Властивості Входу/В’їзду"
+msgid "Edit Entrance (barrier opening)"
+msgstr "Властивості Проходу (в огорожі)"
msgid "Gate"
msgstr "Ворота"
@@ -15975,12 +16330,6 @@ msgstr "вузький лаз"
msgid "stepover"
msgstr "перелаз"
-msgid "Material"
-msgstr "Матеріал"
-
-msgid "stone"
-msgstr "камінь"
-
msgid "Turnstile"
msgstr "Турнікет"
@@ -16041,12 +16390,21 @@ msgstr "Властивості Дренажного каналу"
msgid "Ditch"
msgstr "Канава"
+msgid "Edit Ditch"
+msgstr "Властивості Канави"
+
msgid "Stream"
msgstr "Струмок"
msgid "Edit Stream"
msgstr "Властивості Струмка"
+msgid "Wadi"
+msgstr "Ваді"
+
+msgid "Edit Wadi"
+msgstr "Властивості Ваді"
+
msgid "Canal"
msgstr "Канал"
@@ -16086,9 +16444,6 @@ msgstr "Властивості Дамби"
msgid "Groyne"
msgstr "Хвилелом"
-msgid "Edit Groyne"
-msgstr "Властивості Хвилелому"
-
msgid "Breakwater"
msgstr "Хвилеріз (Мол)"
@@ -16122,6 +16477,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 "Суходіл"
@@ -16203,20 +16573,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 "Поромна переправа"
@@ -16290,8 +16665,8 @@ msgstr "туристичний"
msgid "freight"
msgstr "вантажні"
-msgid "Service/Type"
-msgstr "Сервіс/Тип"
+msgid "Service type"
+msgstr "Тип"
msgid "yard"
msgstr "депо"
@@ -16314,11 +16689,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"
@@ -16329,9 +16707,6 @@ msgstr "Вузькоколійка"
msgid "Edit Narrow Gauge Rail"
msgstr "Властивості Вузькоколійки"
-msgid "Types"
-msgstr "Типи"
-
msgid "Monorail"
msgstr "Монорейка"
@@ -16383,6 +16758,9 @@ msgstr "Властивості занедбаної колії"
msgid "Level Crossing"
msgstr "Залізничний переїзд"
+msgid "Edit Level Crossing"
+msgstr "Властивості переїзду"
+
msgid "Supervised"
msgstr "Охороняється"
@@ -16395,18 +16773,32 @@ msgstr "Звукові сигнали"
msgid "Barrier"
msgstr "Огорожа"
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr "так"
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr "ні"
+
+msgctxt "crossing:barrier"
msgid "half"
-msgstr "половинна"
+msgstr "наполовину"
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "повна"
+msgstr "повністю"
+msgctxt "crossing:barrier"
msgid "double_half"
-msgstr "дві половини"
+msgstr "подвійна половинна"
msgid "Crossing"
msgstr "Перехід"
+msgid "Edit Crossing"
+msgstr "Властивості переходу"
+
msgid "Crossing type"
msgstr "Тип переходу"
@@ -16506,13 +16898,11 @@ msgstr "Транспортерна стрічка"
msgid "Edit Magic Carpet"
msgstr "Властивості транспортерної стрічки"
-msgctxt "aerialway"
msgid "Goods"
-msgstr "Вантажна дорога"
+msgstr "Вантажна"
-msgctxt "aerialway"
msgid "Edit Goods"
-msgstr "Властивості вантажної дороги"
+msgstr "Властивості Вантажної дороги"
msgctxt "aerialway"
msgid "Station"
@@ -16522,11 +16912,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Властивості Станції"
-msgctxt "aerialway"
msgid "Pylon"
msgstr "Опора"
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr "Властивості Опори"
@@ -16545,12 +16933,12 @@ msgstr "наземна"
msgid "underground"
msgstr "підземна"
+msgid "rooftop"
+msgstr "дах"
+
msgid "Access"
msgstr "Дозволи"
-msgid "customers"
-msgstr "клієнти"
-
msgid "Park and Ride"
msgstr "Перехоплююча стоянка"
@@ -16578,9 +16966,6 @@ msgstr "Парковоче місце"
msgid "Edit Parking space"
msgstr "Властивості парковочного місця"
-msgid "rooftop"
-msgstr "дах"
-
msgid "Capacity"
msgstr "Місткість"
@@ -16602,11 +16987,31 @@ 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 "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 "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Вт-Нд 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 "В’їзд на стоянку"
@@ -16755,6 +17160,9 @@ msgstr "Зарядна станція"
msgid "Edit Charging Station (for electric cars)"
msgstr "Властивості Зарядної станції (для електромобілів)"
+msgid "Voltage"
+msgstr "Напруга"
+
msgid "Amperage"
msgstr "Сила струму"
@@ -16776,6 +17184,12 @@ msgstr "Автомайстерня"
msgid "Edit Car Repair"
msgstr "Властивості Автомайстерні"
+msgid "Parts"
+msgstr "Запчастини"
+
+msgid "Edit Car Parts"
+msgstr "Властивості Автозапчастин"
+
msgid "Tyres"
msgstr "Колеса та Шини"
@@ -16803,6 +17217,12 @@ msgstr "Прокат"
msgid "Edit Car Rental"
msgstr "Властивості Прокату автомобілів"
+msgid "Second hand"
+msgstr "Вживані"
+
+msgid "only"
+msgstr "лише"
+
msgid "Sharing"
msgstr "Спільне користування"
@@ -16827,22 +17247,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 "певної марки"
@@ -16864,11 +17268,8 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Запчастини"
-
msgid "Clothes"
-msgstr "Одяг/Дрантя"
+msgstr "Одяг"
msgid "Edit Bicycle Parking"
msgstr "Властивості Велостоянки"
@@ -17061,6 +17462,9 @@ msgstr "Платформа"
msgid "Station or amenities"
msgstr "Станція чи т.і."
+msgid "Edit Stop Position"
+msgstr "Властивості Місця зупинки"
+
msgid "Bus"
msgstr "Автобус"
@@ -17091,6 +17495,9 @@ msgstr "Фунікулер"
msgid "Ferry"
msgstr "Паром"
+msgid "Edit Platform"
+msgstr "Властивості Платформи"
+
msgid "Bench"
msgstr "Лавка"
@@ -17103,9 +17510,6 @@ msgstr "В інвалідних візках"
msgid "limited"
msgstr "обмежений"
-msgid "only"
-msgstr "лише"
-
msgid "Highway platform (legacy)"
msgstr "Зупинка на дорозі (застаріле)"
@@ -17115,9 +17519,14 @@ msgstr "Залізнична платформа (застаріле)"
msgid "funicular"
msgstr "фунікулер"
+msgctxt "railway"
msgid "Station"
msgstr "Станція"
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Властивості Станції"
+
msgid "Building"
msgstr "Будівля"
@@ -17130,6 +17539,9 @@ msgstr "Властивості Входу в метро"
msgid "Ticket Machine"
msgstr "Автомат продажу квитків"
+msgid "Edit Ticket Machine"
+msgstr "Властивості Автомату продажу квитків"
+
msgid "Reference Number"
msgstr "Номер"
@@ -17154,14 +17566,6 @@ msgstr "накопичувальні, дисконтні карти"
msgid "Public Transport (legacy)"
msgstr "Громадський транспорт (застаріле)"
-msgctxt "railway"
-msgid "Station"
-msgstr "Станція"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Властивості Станції"
-
msgid "UIC-Reference"
msgstr "код UIC"
@@ -17210,8 +17614,8 @@ msgstr "Властивості Автобусної платформи"
msgid "Taxi"
msgstr "Таксі"
-msgid "Edit Taxi station"
-msgstr "Властивості Стоянки таксі"
+msgid "Edit Taxi Station"
+msgstr "Властивості Зупинки таксі"
msgid "Airport"
msgstr "Аеропорт"
@@ -17264,12 +17668,27 @@ msgstr "Термінал"
msgid "Edit Terminal"
msgstr "Властивості Терміналу"
-msgctxt "airport"
-msgid "Gate"
-msgstr "Вихід на посадку"
+msgid "Internet access"
+msgstr "Інтернет доступ"
-msgid "Edit Terminal Gate"
-msgstr "Властивості Виходу на посадку"
+msgid "wlan"
+msgstr "бездротовий"
+
+msgid "wired"
+msgstr "по проводах"
+
+msgid "terminal"
+msgstr "термінал"
+
+msgid "Internet access fee"
+msgstr "Плата за інтернет доступ"
+
+msgctxt "airport"
+msgid "Gate"
+msgstr "Вихід на посадку"
+
+msgid "Edit Terminal Gate"
+msgstr "Властивості Виходу на посадку"
msgid "Facilities"
msgstr "Послуги"
@@ -17286,21 +17705,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 "Місця для паління"
@@ -17490,9 +17894,6 @@ msgstr "Стрипклуб"
msgid "Edit Stripclub"
msgstr "Властивості стрипклубу"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Вт-Сб 08:00-15:00; Нд 08:00-12:00"
-
msgid "Tourism"
msgstr "Туризм"
@@ -17514,9 +17915,15 @@ msgstr "Оглядова вежа"
msgid "Information Office"
msgstr "Інформаційне бюро"
+msgid "Edit Information Office"
+msgstr "Властивості Інформаційного бюро"
+
msgid "Map"
msgstr "Мапа"
+msgid "Edit Information Map"
+msgstr "Властивості Мапи"
+
msgid "Detail Grade"
msgstr "Тип мапи"
@@ -17524,11 +17931,14 @@ msgid "topo"
msgstr "топографічна"
msgid "street"
-msgstr "мапа вулиць"
+msgstr "вулиця"
msgid "scheme"
msgstr "план-схема"
+msgid "toposcope"
+msgstr "топоскоп"
+
msgid "Shown Area"
msgstr "Територія"
@@ -17545,7 +17955,7 @@ msgid "Closer Description"
msgstr "Детальний опис"
msgid "Routes shown for:"
-msgstr "Маршрути на мапі:"
+msgstr "Маршрути:"
msgid "Hiking"
msgstr "піші"
@@ -17568,6 +17978,9 @@ msgstr "…інші можливі способи пересування"
msgid "Information Board"
msgstr "Інформаційна дошка"
+msgid "Edit Information Board"
+msgstr "Властивості Інформаційної дошки"
+
msgid "Board Content"
msgstr "Вміст покажчика"
@@ -17578,10 +17991,10 @@ msgid "history"
msgstr "історична довідка"
msgid "nature"
-msgstr "природа"
+msgstr "рослинність"
msgid "wildlife"
-msgstr "жива природа"
+msgstr "дикі тварини"
msgid "plants"
msgstr "рослини"
@@ -17589,23 +18002,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 "Дозвілля"
@@ -17734,50 +18159,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 "Віросповідання"
@@ -17794,6 +18213,12 @@ msgstr "католицизм"
msgid "evangelical"
msgstr "євангелізм"
+msgid "greek_catholic"
+msgstr "греко-католицька"
+
+msgid "greek_orthodox"
+msgstr "грецька православна"
+
msgid "jehovahs_witness"
msgstr "свідки ієгови"
@@ -17806,6 +18231,9 @@ msgstr "методизм"
msgid "mormon"
msgstr "мормонство"
+msgid "new_apostolic"
+msgstr "новоапостольська церква"
+
msgid "orthodox"
msgstr "православ’я"
@@ -17824,38 +18252,139 @@ 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 "Громадські будівлі"
@@ -17944,6 +18473,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 "Медицина"
@@ -18025,12 +18560,66 @@ msgstr "Ветеринар"
msgid "Edit Veterinary"
msgstr "Властивості Ветеренарного пункту"
-msgid "Drinking water"
-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 "Телефон"
@@ -18040,6 +18629,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 "Годинник"
@@ -18049,30 +18662,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 "Видно з відстані"
@@ -18101,8 +18720,8 @@ msgstr "Показує вологість"
msgid "Recycling"
msgstr "Пункт прийому вторинної сировини"
-msgid "Edit Recycling station"
-msgstr "Властивості Пункту прийому вторинної сировини"
+msgid "Edit Recycling Station"
+msgstr "Властивості Пункту прийому вторсировини"
msgid "Batteries"
msgstr "Батарейки/Акумулятори"
@@ -18128,21 +18747,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 "plastic"
-msgstr "пластик"
-
msgid "Amount of Seats"
msgstr "Кількість місць"
@@ -18177,18 +18790,24 @@ msgstr "Властивості Мисливської вежі"
msgid "Height"
msgstr "Висота"
+msgctxt "height"
msgid "low"
msgstr "низька"
+msgctxt "height"
+msgid "half"
+msgstr "половинна"
+
+msgctxt "height"
+msgid "full"
+msgstr "повна"
+
msgid "Hide"
msgstr "Прихована"
msgid "Lock"
msgstr "Зачиняється"
-msgid "Drinking Water"
-msgstr "Питна вода"
-
msgid "Edit Source of Potable Water"
msgstr "Властивості Питної води"
@@ -18220,6 +18839,9 @@ msgstr "ставок"
msgid "Diameter (in mm)"
msgstr "Діаметр (в мм)"
+msgid "Hydrant Position"
+msgstr "Розташування"
+
msgctxt "hydrant position"
msgid "lane"
msgstr "провулок"
@@ -18257,117 +18879,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 "теніс"
@@ -18401,33 +19059,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-кегельний)"
@@ -18461,6 +19129,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 "Собачі перегони"
@@ -18561,38 +19245,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 "Стрільба"
@@ -18633,21 +19335,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 "Ліга регбі"
@@ -18784,6 +19482,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 "Дистанційно керовані автомобілі"
@@ -18796,59 +19506,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 "Башта"
@@ -19074,42 +19858,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 "Геодезичний пункт"
@@ -19117,8 +19927,8 @@ msgstr "Геодезичний пункт"
msgid "Edit Survey Point"
msgstr "Властивості Геодезичного пункту"
-msgid "Surveillance"
-msgstr "Камера спостереження"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Властивості Камери спостереження"
@@ -19129,18 +19939,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 "біопаливо"
@@ -19162,113 +20062,219 @@ msgstr "геотермальний"
msgid "hydro"
msgstr "гідро"
-msgid "nuclear"
-msgstr "атомна"
+msgid "nuclear"
+msgstr "атомна"
+
+msgid "osmotic"
+msgstr "осмотичний"
+
+msgid "solar"
+msgstr "сонце"
+
+msgid "tidal"
+msgstr "приливи"
+
+msgid "waste"
+msgstr "відходи"
+
+msgid "wave"
+msgstr "хвилі"
+
+msgid "wind"
+msgstr "вітряна"
+
+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 "osmotic"
-msgstr "осмотичний"
+msgid "tidal steam / wind"
+msgstr "приливи пари / вітру"
-msgid "solar"
-msgstr "сонце"
+msgid "kaplan_turbine"
+msgstr "поворотно-лопатева гідротурбіна"
-msgid "tidal"
-msgstr "приливи"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr "гидротечія-ріки/ гідро водосховище / приливна гребля"
-msgid "waste"
-msgstr "відходи"
+msgid "pelton_turbine"
+msgstr "ковшова турбіна"
-msgid "wave"
-msgstr "хвилі"
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr "гідро течія-ріки / гідро водосховище"
-msgid "wind"
-msgstr "вітряна"
+msgid "reciprocating_engine"
+msgstr "поршневий двигун"
-msgid "Method"
-msgstr "Спосіб"
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr "біопаливо, біогаз, дизель, газ, бензин"
-msgid "anaerobic_digestion"
-msgstr "анаеробне перетравлення"
+msgid "solar_photovoltaic_panel"
+msgstr "сонячні фотоелектричні панелі"
-msgid "combustion"
-msgstr "спалювання"
+msgid "solar photovoltaic"
+msgstr "сонячні фотоелектричні"
-msgid "dam"
-msgstr "гребля"
+msgid "solar_thermal_collector"
+msgstr "сонячних тепловий колектор"
-msgid "fission"
-msgstr "розщеплення"
+msgid "solar thermal"
+msgstr "сонячне тепло"
-msgid "fusion"
-msgstr "злиття"
+msgid "steam_generator"
+msgstr "парогенератор"
-msgid "gasification"
-msgstr "газифікація"
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+"спалювання біопалива, вугілля, дизелю, газу, бензину, нафти, відходів"
-msgid "photovoltaic"
-msgstr "сонячна"
+msgid "steam_turbine"
+msgstr "парова турбіна"
-msgid "pumped-storage"
-msgstr "гідроакумулятор"
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+"геотермальні / сонячні теплові / спалювання біопалива, вугілля, нафти, "
+"відходів"
-msgid "pumping"
-msgstr "накачування"
+msgid "stellarator"
+msgstr "стеларатор"
-msgid "pyrolysis"
-msgstr "піроліз"
+msgid "nuclear fusion"
+msgstr "ядерний синтез"
-msgid "run-of-the-river"
-msgstr "річковий потік"
+msgid "tokamak"
+msgstr "токамак"
-msgid "thermal"
-msgstr "тепловий"
+msgid "vertical_axis"
+msgstr "вертикальна вісь"
-msgid "Output forms of energy"
-msgstr "Енергія, що генерується"
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr "Киплячий ядерний реакторr 1 (BWR-1)"
-msgid "electricity"
-msgstr "електрична"
+msgid "nuclear fission"
+msgstr "ядерий поділ"
-msgid "2 W"
-msgstr "2 W"
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr "Киплячий ядерний реактор 2 (BWR-2)"
-msgid "3 kW"
-msgstr "3 kW"
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr "Киплячий ядерний реактор 3 (BWR-3)"
-msgid "5 MW"
-msgstr "5 MW"
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr "Киплячий ядерний реактор 4 (BWR-4)"
-msgid "7 GW"
-msgstr "7 GW"
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr "Киплячий ядерний реактор 5 (BWR-5)"
-msgid "hot water"
-msgstr "гаряча вода"
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr "Киплячий ядерний реактор 6 (BWR-6)"
-msgid "hot air"
-msgstr "гаряче повітря"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr "Важководний водо-водяний ядерний реактор виробництва Канади"
-msgid "cold water"
-msgstr "холодна вода"
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr "Китайський Реактор високого тиску (CPR-1000)"
-msgid "cold air"
-msgstr "холодне повітря"
+msgid "European Pressurized Reactor (EPR)"
+msgstr "Європейський Реактор високого тиску (EPR)"
-msgid "compressed air"
-msgstr "стиснене повітря"
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr "Термоядерний синтез (ICF)"
-msgid "steam"
-msgstr "пар"
+msgid "Pressurized water reactor (PWR)"
+msgstr "Водо-водяний ядерний реактор (PWR)"
-msgid "vacuum"
-msgstr "вакуум"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr "Реактор великої потужності канальний 1000 (RBMK-1000)"
-msgid "battery charging"
-msgstr "зарядка батарей"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr "Реактор великої потужності канальний 1500 (RBMK-1500)"
-msgid "Power Station"
-msgstr "Електропідстанція"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr "Водно-водяний Енергетичний реактор (VVER)"
-msgid "Edit Power Station"
-msgstr "Властивості Електропідстанції"
+msgid "Output forms of energy:"
+msgstr "Вид вихідної енергії"
msgid "Power Sub Station"
msgstr "Трансформаторна будка"
@@ -19279,6 +20285,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 "Кабельна розподільча шафа"
@@ -19294,6 +20315,9 @@ msgstr "Властивості Опори ЛЕП"
msgid "Tower reference"
msgstr "Номер опори"
+msgid "steel"
+msgstr "сталь"
+
msgid "Pole"
msgstr "Опора"
@@ -19312,13 +20336,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 "Кількість кабелів"
@@ -19425,11 +20447,11 @@ msgstr "Кіоск"
msgid "Edit Kiosk"
msgstr "Властивості Кіоску"
-msgid "Baker"
-msgstr "Булочна"
+msgid "Bakery"
+msgstr "Пекарня"
-msgid "Edit Baker"
-msgstr "Властивості Булочної"
+msgid "Edit Bakery"
+msgstr "Властивості пекарні"
msgid "Butcher"
msgstr "М’ясна лавка"
@@ -19440,8 +20462,8 @@ msgstr "Властивості М’ясної лавки"
msgid "Seafood"
msgstr "Морепродукти"
-msgid "Edit Seafood"
-msgstr "Властивості Морепродуктів"
+msgid "Edit Seafood Shop"
+msgstr "Властивості магазину морепродуктів"
msgid "Deli (Fine Food)"
msgstr "Делікатеси (Вишукана їжа)"
@@ -19461,6 +20483,9 @@ msgstr "Ринок"
msgid "Edit Marketplace"
msgstr "Властивості Ринку"
+msgid "Organic"
+msgstr "Екологічно чисті продукти"
+
msgid "Greengrocer"
msgstr "Овочевий"
@@ -19473,9 +20498,6 @@ msgstr "Стелаж з фермерськими товарами"
msgid "Edit Farm Stand"
msgstr "Властивості стелажу з фермерськими товарами"
-msgid "Organic"
-msgstr "Екологічно чисті продукти"
-
msgid "Edit Organic/Bio"
msgstr "Властивості магазину натуральних продуктів"
@@ -19545,8 +20567,8 @@ msgstr "Властивості Кравця"
msgid "Fabric"
msgstr "Тканини"
-msgid "Edit Fabric"
-msgstr "Властивості Тканин"
+msgid "Edit Fabric Shop"
+msgstr "Властивості магазину тканин"
msgid "Electronic"
msgstr "Електроніка"
@@ -19566,14 +20588,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 "Аудіо апаратура"
@@ -19581,7 +20603,6 @@ msgstr "Аудіо апаратура"
msgid "Edit Hifi Shop"
msgstr "Властивості Магазину Аудіо апаратури"
-msgctxt "shop"
msgid "Video"
msgstr "Відео"
@@ -19609,6 +20630,12 @@ msgstr "Властивості Пункту обміну валют"
msgid "Edit Automated Teller Machine"
msgstr "Властивості Банкомату"
+msgid "Pawnbroker"
+msgstr "Ломбард"
+
+msgid "Edit Pawnbroker"
+msgstr "Властивості ломбарду"
+
msgid "Department Store"
msgstr "Універмаг"
@@ -19645,11 +20672,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 "Квітковий магазин"
@@ -19678,8 +20726,8 @@ msgstr "Властивості Магазину господарських то
msgid "Paint"
msgstr "Малярні аксесуари"
-msgid "Edit Paint"
-msgstr "Властивості Малярних аксесуарів"
+msgid "Edit Paint Shop"
+msgstr "Властивості магазину малярних аксесуарів"
msgid "Furniture"
msgstr "Меблі"
@@ -19690,20 +20738,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 "Канцтовари"
@@ -19738,8 +20786,8 @@ msgstr "Властивості Турагентства"
msgid "Musical Instrument"
msgstr "Музичні інструменти"
-msgid "Edit Musical Instruments"
-msgstr "Властивості Музичних інструментів"
+msgid "Edit Musical Instruments Shop"
+msgstr "Властивості магазину музичних інструментів"
msgid "Toys"
msgstr "Іграшки"
@@ -19951,6 +20999,12 @@ msgstr "Вершина"
msgid "Edit Peak"
msgstr "Властивості Вершини"
+msgid "Saddle"
+msgstr "Перевал"
+
+msgid "Edit Saddle"
+msgstr "Властивості гірського перевалу"
+
msgid "Glacier"
msgstr "Льодовик"
@@ -19990,26 +21044,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 "Лісовий масив"
@@ -20017,15 +21080,6 @@ msgstr "Лісовий масив"
msgid "Edit Forest Landuse"
msgstr "Властивості Лісового масиву"
-msgid "coniferous"
-msgstr "хвойний"
-
-msgid "deciduous"
-msgstr "листяний"
-
-msgid "mixed"
-msgstr "мішаний"
-
msgid "Grassland"
msgstr "Трави"
@@ -20101,6 +21155,12 @@ msgstr "Левада"
msgid "Edit Meadow Landuse"
msgstr "Властивості Левади"
+msgid "Orchard"
+msgstr "Фруктовий сад"
+
+msgid "Edit Orchard Landuse"
+msgstr "Властивості Фруктового саду"
+
msgid "Vineyard"
msgstr "Виноградник"
@@ -20155,8 +21215,8 @@ msgstr "Майданчик для ігор"
msgid "Edit Recreation Ground Landuse"
msgstr "Властивості Майданчику для ігор"
-msgid "Residential area"
-msgstr "Житлова зона"
+msgid "Residential Area"
+msgstr "Житловий район"
msgid "Edit Residential Landuse"
msgstr "Властивості Житлової зони"
@@ -20167,6 +21227,9 @@ msgstr "Цвинтар"
msgid "Edit Graveyard"
msgstr "Властивості Цвинтаря"
+msgid "shinto"
+msgstr "синтоїзм"
+
msgid "Cemetery"
msgstr "Кладовище"
@@ -20242,6 +21305,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 "Властивості Адреси"
@@ -20278,6 +21368,18 @@ msgstr "парні"
msgid "alphabetic"
msgstr "за абеткою"
+msgid "Accuracy"
+msgstr "Точність"
+
+msgid "actual"
+msgstr "актуальна"
+
+msgid "estimate"
+msgstr "приблизна"
+
+msgid "potential"
+msgstr "можлива"
+
msgid "Contact (common schema)"
msgstr "Контакти (загальна схема)"
@@ -20446,21 +21548,50 @@ 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 "Опис символів"
@@ -20506,26 +21637,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 "Властивості зв’язаної вулиці"
+msgid "Edit Associated Street"
+msgstr "Властивості Вулиці (Associated Street)"
+
+msgid "house"
+msgstr "будинок"
msgid "Street"
-msgstr "Вулиця"
+msgstr "Вулиця (Street)"
msgid "Edit Street"
-msgstr "Властивості вулиці"
+msgstr "Властивості Вулиці (Street)"
msgid "ways being part of street"
msgstr "ліній — частини вулиці"
@@ -20542,8 +21676,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 "Місце призначення (без відстані)"
@@ -20638,18 +21772,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 "кінь"
@@ -20659,8 +21802,11 @@ msgstr "бар’єр"
msgid "motorroad"
msgstr "дорога для автомобілів"
-msgid "highway_track"
-msgstr "траса"
+msgid "highway.track"
+msgstr "highway.track"
+
+msgid "livingdashed"
+msgstr "livingdashed"
msgid "services"
msgstr "послуги"
@@ -20668,11 +21814,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 "берег ріки"
@@ -20689,6 +21835,9 @@ msgstr "пороги"
msgid "railwaypoint"
msgstr "точка залізниці"
+msgid "raildashed"
+msgstr "raildashed"
+
msgid "railyard"
msgstr "депо"
@@ -20704,29 +21853,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 "енергія"
@@ -20746,20 +21895,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 "готель"
@@ -20833,11 +21982,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 "адреса"
@@ -20851,9 +22003,6 @@ msgstr "Село/Місто"
msgid "One Way"
msgstr "Одностороння"
-msgid "Church"
-msgstr "Храм"
-
msgid "Fuel Station"
msgstr "АЗС"
@@ -20881,6 +22030,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 "Дороги без класифікації, що не мають назви"
@@ -20894,7 +22046,7 @@ msgid "misspelled key name"
msgstr "помилки в ключі name"
msgid "cycleway with tag bicycle"
-msgstr "вело-доріжки із теґом bicycle"
+msgstr "велодоріжки із теґом bicycle"
msgid "footway with tag foot"
msgstr "тротуари із теґом foot"
@@ -20926,11 +22078,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"
@@ -20941,8 +22123,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"
@@ -20959,8 +22141,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"
@@ -21034,62 +22216,173 @@ msgstr "теґ pzb без теґу railway"
msgid "radio without railway"
msgstr "теґ radio без теґу railway"
-msgid "structure_gauge without railway"
-msgstr "теґ structure_gauge без теґу railway"
+msgid "structure_gauge without railway"
+msgstr "теґ structure_gauge без теґу railway"
+
+msgid "tilting_technologie without railway"
+msgstr "теґ tilting_technologie без теґу railway"
+
+msgid "track_class without railway"
+msgstr "теґ track_class без теґу railway"
+
+msgid "tracks without railway"
+msgstr "теґ tracks без теґу railway"
+
+msgid "traffic_mode without railway"
+msgstr "теґ traffic_mode без теґу railway"
+
+msgid "usage without railway"
+msgstr "теґ usage без теґу railway"
+
+msgid "workrules without railway"
+msgstr "теґ workrules без теґу railway"
+
+msgid "stream without waterway"
+msgstr "теґ stream без теґу waterway"
+
+msgid "intermittent without waterway"
+msgstr "теґ intermittent без теґу waterway"
+
+msgid "boat without waterway / natural=water"
+msgstr "теґ boat без теґу waterway / natural=water"
+
+msgid "length_unit without waterway"
+msgstr "теґ length_unit без теґу waterway"
+
+msgid "llid without waterway"
+msgstr "теґ llid без теґу waterway"
+
+msgid "canal without waterway"
+msgstr "теґ canal без теґу waterway"
+
+msgid "have_riverbank without waterway"
+msgstr "теґ have_riverbank без теґу 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 "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 "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 "tilting_technologie without railway"
-msgstr "теґ tilting_technologie без теґу railway"
+msgid "source:geometry on a node"
+msgstr "source:geometry на точці"
-msgid "track_class without railway"
-msgstr "теґ track_class без теґу railway"
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr "source:[addr:]postcode без addr:postcode"
-msgid "tracks without railway"
-msgstr "теґ tracks без теґу railway"
+msgid "source:postal_code without addr:postcode"
+msgstr "source:postal_code без addr:postcode"
-msgid "traffic_mode without railway"
-msgstr "теґ traffic_mode без теґу railway"
+msgid "source:ele without ele"
+msgstr "source:ele без ele"
-msgid "usage without railway"
-msgstr "теґ usage без теґу railway"
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr "source:ref:INSEE без ref:INSEE"
-msgid "workrules without railway"
-msgstr "теґ workrules без теґу railway"
+msgid "source:lit without lit"
+msgstr "source:lit без lit"
-msgid "stream without waterway"
-msgstr "теґ stream без теґу waterway"
+msgid "source:hgv without hgv"
+msgstr "source:hgv без hgv"
-msgid "intermittent without waterway"
-msgstr "теґ intermittent без теґу waterway"
+msgid "source:outline on a node"
+msgstr "source:outline на точці"
-msgid "boat without waterway / natural=water"
-msgstr "теґ boat без теґу waterway / natural=water"
+msgid "source:highway without highway"
+msgstr "source:highway без highway"
-msgid "length_unit without waterway"
-msgstr "теґ length_unit без теґу waterway"
+msgid "source:maxaxleload without maxaxleload"
+msgstr "source:maxaxleload без maxaxleload"
-msgid "llid without waterway"
-msgstr "теґ llid без теґу waterway"
+msgid "source:surface without surface"
+msgstr "source:surface без surface"
-msgid "canal without waterway"
-msgstr "теґ canal без теґу waterway"
+msgid "source:bridge without bridge"
+msgstr "source:bridge без bridge"
-msgid "have_riverbank without waterway"
-msgstr "теґ have_riverbank без теґу waterway"
+msgid "source:old_name without old_name"
+msgstr "source:old_name без old_name"
-msgid "tunnel without highway/railway/waterway"
-msgstr "теґ tunnel без теґу highway/railway/waterway"
+msgid "source:bicycle without bicycle"
+msgstr "source:bicycle без bicycle"
-msgid "bridge without highway/railway/waterway"
-msgstr "теґ bridge без теґу highway/railway/waterway"
+msgid "source:designation without designation"
+msgstr "source:designation без designation"
-msgid "psv without highway/railway/waterway"
-msgstr "теґ psv без теґу highway/railway/waterway"
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr "source:[addr:]housenumber без addr:housenumber"
-msgid "width without physical linear feature"
-msgstr "теґ width на нелінійному об’єкті"
+msgid "source:height without height"
+msgstr "source:height без height"
-msgid "maxspeed without highway/railway/traffic_sign"
-msgstr "теґ maxspeed без теґу highway/railway/traffic_sign"
+msgid "source:lanes without lanes"
+msgstr "source:lanes без lanes"
msgid "religion without denomination"
msgstr "теґ religion без теґу denomination"
@@ -21109,9 +22402,58 @@ 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 повинно бути число із можливим кроком .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"
@@ -21121,20 +22463,29 @@ msgstr "Yahoo - супутникові знімки"
msgid "Bing Sat"
msgstr "Bing - супутникові знімки"
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr "HDDM (Humanitarian OpenStreetMap)"
+
msgid "MapBox Satellite"
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 Ч/Б)"
-msgid "Skobbler"
-msgstr "Skobbler"
+msgid "skobbler"
+msgstr "skobbler"
+
+msgid "skobbler heatmap"
+msgstr "skobbler heatmap"
msgid "skobbler heatmap"
msgstr "skobbler heatmap"
@@ -21154,8 +22505,8 @@ msgstr "OpenStreetMap (Німецький стиль)"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Камбоджа, Лаос, Таїланд, В’єтнам дві мови"
-msgid "2u"
-msgstr "2u"
+msgid "osmfr"
+msgstr "osmfr"
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI ч/б 2.5м"
@@ -21163,6 +22514,9 @@ msgstr "AGRI ч/б 2.5м"
msgid "Geoimage.at MaxRes"
msgstr "Geoimage.at MaxRes"
+msgid "basemap.at"
+msgstr "basemap.at"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (основна мапа)"
@@ -21309,6 +22663,31 @@ 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 (Гаїті)"
@@ -21475,6 +22854,9 @@ msgstr "USGS Зображення великого масштабу"
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr "OSM US TIGER 2012 Шар доріг"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr "Нові та зміщені дороги TIGER (TIGER 2013)"
+
msgid "OSM - Tiger Edited Map"
msgstr "OSM - мапа під редакцією Tiger"
@@ -21520,6 +22902,39 @@ msgstr "OS Scottish Popular історичні"
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 "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"
@@ -21672,7 +23087,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"
@@ -21731,6 +23146,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 "Відкрити вікно профілів висоти"
@@ -21752,14 +23179,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}''."
@@ -22035,11 +23456,14 @@ 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 "Housenumber increment:"
-msgstr "Прирощення номеру будинку"
+msgid "House number increment:"
+msgstr "Прирощення номерів будинків"
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
@@ -22248,8 +23672,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 символів"
@@ -22624,15 +24048,6 @@ msgstr "Номер дома:"
msgid "Street Name:"
msgstr "Вулиця:"
-msgid "Increment"
-msgstr "Збільшення"
-
-msgid "Decrement"
-msgstr "Зменшення"
-
-msgid "Numbers:"
-msgstr "Номери:"
-
msgid "Big buildings mode"
msgstr "Режим великих будівель"
@@ -22824,6 +24239,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 зі списку"
@@ -22843,12 +24261,6 @@ msgstr "50 м"
msgid "100 m"
msgstr "100 м"
-msgid "high"
-msgstr "високий"
-
-msgid "medium"
-msgstr "середній"
-
msgid "symbol"
msgstr "символ"
@@ -23000,6 +24412,10 @@ msgid ""
msgstr ""
"Додайте \"Таблицю(і) збірки\" у перелік кадастрових листів для захвату."
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+"Замініть сірі відтінки білим кольором (менші файли та використання пам’яті)"
+
msgid "Display crosspieces:"
msgstr "Показати перемички:"
@@ -23021,6 +24437,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=…\"?"
@@ -23269,8 +24688,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 "Векторизований."
@@ -23321,7 +24743,7 @@ msgstr "Вилучити обрану схему зі списку."
msgid "Color Schemes"
msgstr "Колірні схеми"
-msgid "Adress"
+msgid "Address"
msgstr "Адреса"
msgid "Split area"
@@ -23357,7 +24779,7 @@ msgid "TCX Files (*.tcx)"
msgstr "TCX файли (*.tcx)"
msgid "Download along..."
-msgstr "Завантаження вздовж…"
+msgstr "Завантажити вздовж…"
msgid "Download OSM data along the selected ways."
msgstr "Завантаження даних OSM вздовж виділеної лінії."
@@ -23474,7 +24896,7 @@ msgid "Zoom in to see messages"
msgstr "Наблизитись, щоб побачити повідомлення"
msgid "Login"
-msgstr "Користувач"
+msgstr "Увійти"
msgid "Enable autologin"
msgstr "Входити автоматично"
@@ -23489,13 +24911,13 @@ msgid "not logged in"
msgstr "не ввійшли в систему"
msgid "User {0} has left"
-msgstr "Користувач {0} вийшов"
+msgstr "Учасник {0} вийшов"
msgid "User {0} is mapping nearby"
-msgstr "Користувач {0} мапить поруч з вами"
+msgstr "Учасник {0} мапить поруч з вами"
msgid "Users mapping nearby:"
-msgstr "Користувачі поруч:"
+msgstr "Учасникі поруч:"
msgid "Private chat"
msgstr "Приватний чат"
@@ -23510,7 +24932,7 @@ msgid "Clear log"
msgstr "Очистити журнал"
msgid "Show users on map"
-msgstr "Показати користувачів на мапі"
+msgstr "Показати учасників на мапі"
msgid "Position only"
msgstr "Тільки положення"
@@ -23551,27 +24973,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 "Імпортувати дані з пристрою"
@@ -24182,8 +25586,8 @@ msgid ""
"Please make sure it is as precise as possible, and describe a region this "
"offset is applicable to."
msgstr ""
-"Ви зберігаєте зсув фону. Інші користувачі будуть використовувати його під "
-"час креслення мапи\n"
+"Ви зберігаєте зсув фону. Інші учасники будуть використовувати його під час "
+"креслення мапи\n"
"цієї місцевості. Переконайтесь, що він є максимально точним, та опишіть "
"місцевість для якої він підходить."
@@ -24681,7 +26085,7 @@ msgid "Missing input data"
msgstr "Вхідні дані відсутні"
msgid "Measured values"
-msgstr "Виміряні значення"
+msgstr "Результати вимірювання"
msgid "Open the measurement window."
msgstr "Відкрити вікно вимірювань."
@@ -24723,9 +26127,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 "Мічиганський поворот ліворуч"
@@ -25443,9 +26872,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Сталася помилка: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "Не вдалося створити повідомлення про нову помилку. Результат: {0}"
-
msgid "Process queue"
msgstr "Обробити чергу"
@@ -25502,18 +26928,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 "Відкрити в оглядачі"
@@ -25866,6 +27280,27 @@ msgstr "Тест не пройдено: Неможливо прочитати mt
msgid "Test failed: Could not write mtime."
msgstr "Тест не пройдено: Не можу записати mtime."
+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}?"
@@ -26021,6 +27456,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"
@@ -26344,9 +27782,6 @@ msgstr "Файл GPX не містить ні треку, а ні маршрут
msgid "Create Stops from GPX"
msgstr "Створити зупинки з GPX"
-msgid "Tracks"
-msgstr "Треки"
-
msgid "Tracks in this GPX file:"
msgstr "Треки у файлі GPX:"
@@ -26565,6 +28000,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}"
@@ -26600,15 +28038,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 "Шаблони для країн:"
@@ -26723,9 +28181,6 @@ msgstr "Налаштування втулку маршрутизації"
msgid "Configure routing preferences."
msgstr "Задати налаштування маршрутизації"
-msgid "Highway type"
-msgstr "Тип дороги"
-
msgid "Speed (Km/h)"
msgstr "Швидкість (км/г)"
@@ -26928,20 +28383,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 "Автозбереження редагованих даних"
@@ -27165,6 +28620,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"
@@ -27204,6 +28756,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..."
@@ -27369,9 +28926,6 @@ msgstr "Підпис скасовано!"
msgid "Please give a tolerance in meters"
msgstr "Будь ласка, додайте припущення у метрах"
-msgid "Accuracy"
-msgstr "Точність"
-
msgid "Select as much as you like:"
msgstr "Виділіть стільки, скільки вам потрібно:"
@@ -28246,7 +29800,7 @@ msgid "Change relation member for {0} {1}"
msgstr "Заміна члену зв’язку {0} {1}"
msgid "Circle arc"
-msgstr "Дуга кола"
+msgstr "Дуга"
msgid "Create a circle arc"
msgstr "Створити дугу кола"
@@ -28519,9 +30073,6 @@ msgstr "Зняти виділення з точок"
msgid "Removes all nodes from selection"
msgstr "Зняти виділення з усіх точок"
-msgid "Video"
-msgstr "Відео"
-
msgid "Import Video"
msgstr "Імпортувати відео"
@@ -28825,9 +30376,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 0d845e9..32a3b39 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-08-04 03:41+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-08-05 05:04+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -159,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 ""
@@ -250,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -289,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -343,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 ""
@@ -523,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -636,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 ""
@@ -786,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"
@@ -972,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 ""
@@ -995,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>"
@@ -1163,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1304,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"
@@ -1399,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 ""
@@ -1683,6 +1703,9 @@ msgstr ""
msgid "({0}/{1}) Loading parents of relation {2}"
msgstr ""
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1902,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] ""
@@ -2328,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 ""
@@ -2524,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 ""
@@ -2611,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 ""
@@ -2647,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"
@@ -2673,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}''"
@@ -2778,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] ""
@@ -2838,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"
@@ -2869,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"
@@ -2893,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 ""
@@ -2923,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 ""
@@ -2943,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 ""
@@ -2952,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 ""
@@ -2972,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}"
@@ -3003,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}''."
@@ -3160,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 ""
@@ -3268,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 ""
@@ -3306,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3347,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3371,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 ""
@@ -3430,6 +3469,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3512,6 +3554,15 @@ 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 ""
@@ -3581,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 ""
@@ -3638,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})"
@@ -3676,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}"
@@ -3813,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"
@@ -3888,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 ""
@@ -3918,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3945,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''"
@@ -4011,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 ""
@@ -4131,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"
@@ -4360,6 +4400,18 @@ 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 ""
@@ -4464,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 ""
@@ -4764,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"
@@ -4801,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"
@@ -4853,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 ""
@@ -5110,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 ""
@@ -5638,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5721,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 ""
@@ -5811,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 ""
@@ -5982,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 ""
@@ -6269,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"
@@ -6335,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"
@@ -6377,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)"
@@ -6537,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"
@@ -6855,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 ""
@@ -6986,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 ""
@@ -7010,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 ""
@@ -7123,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."
@@ -7222,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7309,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"
@@ -7328,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 ""
@@ -7394,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"
@@ -7470,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 ""
@@ -7485,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"
@@ -7701,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 "
@@ -7715,13 +7795,29 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+msgid "Please specify a changeset source"
msgstr ""
-msgid "Cancel and return to the previous dialog"
+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 "Do not show this message again"
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+msgid "Do not show this message again"
msgstr ""
msgid "Please enter a valid chunk size first"
@@ -7730,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 ""
@@ -7737,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 ..."
@@ -7850,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] ""
@@ -7862,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>"
@@ -7878,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:"
@@ -8024,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8054,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"
@@ -8407,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8428,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 ""
@@ -8485,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8551,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 ""
@@ -8734,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}''..."
@@ -8756,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"
@@ -8766,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:"
@@ -8987,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}''"
@@ -9702,6 +9811,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9770,6 +9912,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9823,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 ""
@@ -10279,6 +10429,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 ""
@@ -10342,7 +10498,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 ""
@@ -10600,40 +10756,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}''"
@@ -10686,8 +10842,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:"
@@ -10696,20 +10852,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 ""
@@ -10791,14 +10952,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,7 +11026,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10950,9 +11105,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10971,6 +11123,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 ""
@@ -11000,9 +11160,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 ""
@@ -11033,7 +11233,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 ""
@@ -11073,28 +11273,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..."
@@ -11189,6 +11387,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11204,12 +11405,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}."
@@ -11288,7 +11497,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11387,35 +11596,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 ""
@@ -11425,8 +11610,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 ..."
@@ -11453,10 +11638,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>"
@@ -11540,8 +11722,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}."
@@ -11738,7 +11920,7 @@ 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}"
@@ -11784,6 +11966,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."
@@ -11814,19 +12005,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 ""
@@ -11848,11 +12039,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 ""
@@ -11922,13 +12125,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}''"
@@ -12071,10 +12274,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"
@@ -12089,22 +12292,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}''"
@@ -12173,8 +12375,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..."
@@ -12189,9 +12390,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}''"
@@ -12513,12 +12729,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12529,30 +12744,73 @@ 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 "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] ""
+
+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"
@@ -12563,9 +12821,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."
@@ -12888,6 +13160,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 ""
@@ -13127,6 +13404,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."
@@ -13176,9 +13456,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 ""
@@ -13215,6 +13492,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 ""
@@ -13345,6 +13627,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13435,6 +13720,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 ""
@@ -13453,10 +13782,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 +13797,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13495,18 +13827,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 ""
@@ -13516,9 +13842,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13528,13 +13851,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13582,6 +13905,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13666,6 +13992,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13770,21 +14099,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 ""
@@ -13800,10 +14138,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"
@@ -13839,7 +14177,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13908,12 +14246,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 ""
@@ -13929,15 +14273,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 ""
@@ -13959,6 +14294,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13968,6 +14312,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13977,10 +14324,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14013,9 +14357,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14058,6 +14399,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14073,6 +14420,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14142,19 +14492,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14185,6 +14529,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14194,10 +14539,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14251,12 +14596,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14317,12 +14656,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14362,9 +14710,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14398,6 +14743,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 ""
@@ -14479,18 +14839,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 ""
@@ -14566,7 +14931,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14590,10 +14955,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"
@@ -14605,9 +14973,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14659,6 +15024,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14671,6 +15039,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14782,11 +15185,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14798,11 +15199,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14821,10 +15220,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14854,9 +15253,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14878,10 +15274,29 @@ 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"
@@ -15031,6 +15446,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15052,6 +15470,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15079,6 +15503,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15103,22 +15533,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 ""
@@ -15140,9 +15554,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15337,6 +15748,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15367,6 +15781,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15379,9 +15796,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15391,9 +15805,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15406,6 +15825,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15430,14 +15852,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15486,7 +15900,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15540,41 +15954,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"
@@ -15766,9 +16180,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15790,9 +16201,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15805,6 +16222,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15844,6 +16264,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15865,22 +16288,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"
@@ -16010,49 +16445,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"
@@ -16070,6 +16499,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16082,6 +16517,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16100,37 +16538,137 @@ 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"
@@ -16220,6 +16758,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 ""
@@ -16301,128 +16845,206 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+msgid "unorthodox"
msgstr ""
-msgid "Amount of Seats"
+msgid "Support"
msgstr ""
-msgid "Edit Shelter"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
+msgstr ""
+
+msgid "Amount of Seats"
+msgstr ""
+
+msgid "Edit Shelter"
msgstr ""
msgid "Type of shelter"
@@ -16453,16 +17075,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16496,6 +17124,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16533,117 +17164,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 ""
@@ -16677,33 +17344,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 ""
@@ -16737,6 +17414,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 ""
@@ -16837,36 +17530,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 ""
@@ -16909,19 +17620,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 ""
@@ -17060,6 +17767,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 ""
@@ -17072,60 +17791,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 ""
@@ -17350,41 +18143,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"
@@ -17393,7 +18212,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17405,12 +18224,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 ""
@@ -17462,88 +18371,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17555,6 +18567,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 ""
@@ -17570,6 +18597,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17588,11 +18618,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17701,10 +18729,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17716,7 +18744,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17737,6 +18765,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17749,9 +18780,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17821,7 +18849,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17842,13 +18870,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"
@@ -17857,7 +18885,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17885,6 +18912,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17921,10 +18954,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"
@@ -17954,7 +19008,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17966,19 +19020,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"
@@ -18014,7 +19068,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18227,6 +19281,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18266,24 +19326,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 ""
@@ -18293,15 +19362,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18377,6 +19437,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18431,7 +19497,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18443,6 +19509,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18479,43 +19548,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18554,6 +19650,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18722,21 +19830,50 @@ 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 ""
+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 ""
@@ -18782,19 +19919,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"
@@ -18818,7 +19958,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18914,18 +20054,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 ""
@@ -18935,7 +20084,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18944,10 +20096,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18965,6 +20117,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18980,28 +20135,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"
@@ -19022,19 +20177,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"
@@ -19109,10 +20264,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19127,9 +20285,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19157,6 +20312,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19202,10 +20360,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"
@@ -19217,7 +20405,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"
@@ -19235,7 +20423,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19352,19 +20540,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 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"
@@ -19383,7 +20682,46 @@ 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 "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 "Landsat"
@@ -19395,19 +20733,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 "skobbler heatmap"
@@ -19428,7 +20775,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19437,6 +20784,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19583,6 +20933,29 @@ 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 ""
@@ -19748,6 +21121,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19793,6 +21169,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19979,19 +21388,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20015,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}''."
@@ -20284,10 +21699,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20491,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"
@@ -20762,15 +22180,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20941,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 ""
@@ -20959,12 +22371,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21100,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 ""
@@ -21117,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 ""
@@ -21343,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."
@@ -21393,7 +22808,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21578,6 +22993,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21617,27 +23097,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 ""
@@ -22715,9 +24177,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 ""
@@ -23364,9 +24843,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23419,18 +24895,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 ""
@@ -23777,6 +25241,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23928,6 +25413,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 ""
@@ -24245,9 +25733,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24463,6 +25948,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 ""
@@ -24495,15 +25983,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 ""
@@ -24618,9 +26122,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24799,19 +26300,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"
@@ -25027,6 +26528,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 ""
@@ -25063,6 +26653,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..."
@@ -25215,9 +26808,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26203,9 +27793,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26484,9 +28071,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 88b80f7..3483ff0 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-08-04 03:41+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-08-05 05:04+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ 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 ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -162,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 "
@@ -256,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"
@@ -295,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}"
@@ -351,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"
@@ -532,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 ""
@@ -645,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 ""
@@ -795,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"
@@ -979,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 ""
@@ -1002,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>"
@@ -1171,9 +1170,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1315,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"
@@ -1416,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"
@@ -1700,6 +1717,9 @@ 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})"
@@ -1918,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] ""
@@ -2348,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 ""
@@ -2547,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 ""
@@ -2634,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 ""
@@ -2670,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"
@@ -2695,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}''"
@@ -2800,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] ""
@@ -2860,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ệ"
@@ -2893,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"
@@ -2917,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 ""
@@ -2947,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 ""
@@ -2967,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 ""
@@ -2976,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 ""
@@ -2996,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}"
@@ -3027,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}''."
@@ -3181,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 ""
@@ -3289,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 ""
@@ -3327,9 +3352,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3368,6 +3390,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3392,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 ""
@@ -3451,6 +3485,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr ""
@@ -3533,6 +3570,15 @@ 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 ""
@@ -3602,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 ""
@@ -3659,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})"
@@ -3697,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}"
@@ -3834,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"
@@ -3909,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 ""
@@ -3939,9 +3994,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3966,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''"
@@ -4032,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 ""
@@ -4150,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"
@@ -4379,6 +4414,18 @@ 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 ""
@@ -4483,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 ""
@@ -4783,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 "> 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"
@@ -4820,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"
@@ -4872,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 ""
@@ -5129,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 ""
@@ -5657,6 +5701,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5740,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 ""
@@ -5830,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 ""
@@ -6001,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 ""
@@ -6288,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"
@@ -6354,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 "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"
@@ -6396,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)"
@@ -6556,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"
@@ -6874,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 ""
@@ -7005,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, "
@@ -7029,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 ""
@@ -7142,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."
@@ -7241,6 +7315,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7335,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"
@@ -7354,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 ""
@@ -7420,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"
@@ -7496,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 ""
@@ -7511,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"
@@ -7727,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 "
@@ -7741,7 +7816,23 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-msgid "Return to the previous dialog to enter a more descriptive comment"
+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 ""
msgid "Cancel and return to the previous dialog"
@@ -7756,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 ""
@@ -7763,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 ..."
@@ -7876,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] ""
@@ -7888,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>"
@@ -7904,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:"
@@ -8050,7 +8156,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8080,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"
@@ -8435,9 +8541,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8456,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 ""
@@ -8513,6 +8619,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8579,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 ""
@@ -8762,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}''..."
@@ -8784,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"
@@ -8794,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:"
@@ -9015,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}''"
@@ -9730,6 +9834,39 @@ 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 ""
+
+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: NonDefalut"
msgstr ""
@@ -9798,6 +9935,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9851,6 +9991,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 ""
@@ -10307,6 +10452,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 ""
@@ -10370,7 +10521,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 ""
@@ -10628,40 +10779,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}''"
@@ -10714,8 +10865,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:"
@@ -10724,20 +10875,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 ""
@@ -10819,14 +10975,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"
@@ -10899,7 +11049,7 @@ msgstr ""
msgid "New relation"
msgstr ""
-msgid "Change Properties"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10978,9 +11128,6 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr ""
-
msgid "Error parsing {0}: "
msgstr ""
@@ -10999,6 +11146,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 ""
@@ -11028,9 +11183,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 ""
@@ -11061,7 +11256,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 ""
@@ -11101,28 +11296,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..."
@@ -11221,6 +11414,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11236,12 +11432,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}."
@@ -11320,8 +11524,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 ""
@@ -11419,35 +11623,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 ""
@@ -11457,8 +11637,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 ..."
@@ -11485,10 +11665,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>"
@@ -11572,8 +11749,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}."
@@ -11770,7 +11947,7 @@ 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}"
@@ -11816,6 +11993,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."
@@ -11846,19 +12032,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 ""
@@ -11880,11 +12066,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 ""
@@ -11954,13 +12152,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}''"
@@ -12103,10 +12301,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"
@@ -12121,22 +12319,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}''"
@@ -12205,8 +12402,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..."
@@ -12221,9 +12417,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}''"
@@ -12545,12 +12756,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}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12561,27 +12771,70 @@ 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 "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] ""
+
+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"
@@ -12595,9 +12848,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."
@@ -12920,6 +13187,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 ""
@@ -13159,6 +13431,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."
@@ -13208,9 +13483,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 ""
@@ -13247,6 +13519,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 ""
@@ -13377,6 +13654,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13467,6 +13747,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 ""
@@ -13485,10 +13809,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13500,6 +13824,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13527,18 +13854,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 ""
@@ -13548,9 +13869,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13560,13 +13878,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13614,6 +13932,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13698,6 +14019,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13802,21 +14126,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 ""
@@ -13832,10 +14165,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"
@@ -13871,7 +14204,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13940,12 +14273,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 ""
@@ -13961,15 +14300,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 ""
@@ -13991,6 +14321,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -14000,6 +14339,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -14009,10 +14351,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14045,9 +14384,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14090,6 +14426,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr ""
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
@@ -14105,6 +14447,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr ""
@@ -14174,19 +14519,13 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
+msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
-msgid "chain"
-msgstr ""
-
-msgid "hedge"
-msgstr ""
-
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14217,6 +14556,7 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
msgstr ""
@@ -14226,10 +14566,10 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
+msgid "Entrance (barrier opening)"
msgstr ""
-msgid "Edit Entrance"
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14283,12 +14623,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
msgid "Turnstile"
msgstr ""
@@ -14349,12 +14683,21 @@ msgstr ""
msgid "Ditch"
msgstr ""
+msgid "Edit Ditch"
+msgstr ""
+
msgid "Stream"
msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14394,9 +14737,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14430,6 +14770,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 ""
@@ -14511,18 +14866,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 ""
@@ -14598,7 +14958,7 @@ msgstr ""
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14622,10 +14982,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"
@@ -14637,9 +15000,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14691,6 +15051,9 @@ msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr ""
@@ -14703,6 +15066,41 @@ 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 "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
msgid "half"
msgstr ""
@@ -14814,11 +15212,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14830,11 +15226,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14853,10 +15247,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14886,9 +15280,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14910,10 +15301,29 @@ 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"
@@ -15063,6 +15473,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -15084,7 +15497,13 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
-msgid "Tyres"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
+msgid "Tyres"
msgstr ""
msgid "Edit Tyres"
@@ -15111,6 +15530,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15135,22 +15560,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 ""
@@ -15172,9 +15581,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15369,6 +15775,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15399,6 +15808,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15411,9 +15823,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15423,9 +15832,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15438,6 +15852,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15462,14 +15879,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15518,7 +15927,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15572,41 +15981,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"
@@ -15798,9 +16207,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
-
msgid "Tourism"
msgstr ""
@@ -15822,9 +16228,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15837,6 +16249,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15876,6 +16291,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15897,22 +16315,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"
@@ -16042,49 +16472,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"
-msgstr ""
+msgid "Church"
+msgstr "Nhà thờ"
-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"
@@ -16102,6 +16526,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16114,6 +16544,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16132,37 +16565,137 @@ 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"
@@ -16252,6 +16785,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 ""
@@ -16333,122 +16872,200 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Drinking water"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
+msgid "Access rights"
msgstr ""
-msgid "Telephone"
+msgid "public"
msgstr ""
-msgid "Edit Telephone"
+msgid "seasonal"
msgstr ""
-msgid "Telephone cards"
+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 ""
-msgid "billboard"
+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 "Shows temperature"
+msgid "Telephone"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Edit Telephone"
msgstr ""
-msgid "Shows humidity"
+msgid "Telephone cards"
msgstr ""
-msgid "Recycling"
+msgid "Emergency Phone"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Internet Access"
msgstr ""
-msgid "Batteries"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Cans"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Glass"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Paper"
+msgid "Located inside a building?"
msgstr ""
-msgid "Scrap Metal"
+msgid "Last check date (YYYY-MM-DD)"
msgstr ""
-msgid "container"
+msgid "Last check note"
msgstr ""
-msgid "centre"
+msgid "Clock"
msgstr ""
-msgid "Waste Basket"
+msgid "Edit Clock"
msgstr ""
-msgid "Edit Waste Basket"
+msgid "Display"
msgstr ""
-msgid "Waste Disposal"
+msgid "analog"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "digital"
msgstr ""
-msgid "Backrest"
+msgid "sundial"
msgstr ""
-msgid "plastic"
+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 ""
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
+msgstr ""
+
+msgid "Cans"
+msgstr ""
+
+msgid "Glass"
+msgstr ""
+
+msgid "Paper"
+msgstr ""
+
+msgid "Scrap Metal"
+msgstr ""
+
+msgid "container"
+msgstr ""
+
+msgid "centre"
+msgstr ""
+
+msgid "Waste Basket"
+msgstr ""
+
+msgid "Waste Disposal"
+msgstr ""
+
+msgid "Edit Bench"
+msgstr ""
+
+msgid "Backrest"
msgstr ""
msgid "Amount of Seats"
@@ -16485,16 +17102,22 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
-msgid "Hide"
+msgctxt "height"
+msgid "half"
msgstr ""
-msgid "Lock"
+msgctxt "height"
+msgid "full"
msgstr ""
-msgid "Drinking Water"
+msgid "Hide"
+msgstr ""
+
+msgid "Lock"
msgstr ""
msgid "Edit Source of Potable Water"
@@ -16528,6 +17151,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16565,117 +17191,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 ""
@@ -16709,33 +17371,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 ""
@@ -16769,6 +17441,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 ""
@@ -16869,36 +17557,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 ""
@@ -16941,19 +17647,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 ""
@@ -17092,6 +17794,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 ""
@@ -17104,60 +17818,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 ""
@@ -17382,41 +18170,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"
@@ -17425,7 +18239,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17437,12 +18251,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 ""
@@ -17494,88 +18398,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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "Edit Power Station"
+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"
@@ -17587,6 +18594,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 ""
@@ -17602,6 +18624,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17620,11 +18645,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17733,10 +18756,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17748,7 +18771,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17769,6 +18792,9 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
@@ -17781,9 +18807,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr ""
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17853,7 +18876,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17874,13 +18897,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"
@@ -17889,7 +18912,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17917,6 +18939,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17953,10 +18981,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"
@@ -17986,7 +19035,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17998,19 +19047,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"
@@ -18046,7 +19095,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18259,6 +19308,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18298,24 +19353,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 ""
@@ -18325,15 +19389,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18409,6 +19464,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18463,7 +19524,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18475,6 +19536,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18511,43 +19575,70 @@ msgstr ""
msgid "Edit Railway Landuse"
msgstr ""
-msgid "Military"
+msgid "Military"
+msgstr ""
+
+msgid "Edit Military Landuse"
+msgstr ""
+
+msgid "Construction area"
+msgstr ""
+
+msgid "Edit Construction Landuse"
+msgstr ""
+
+msgid "Brownfield"
+msgstr ""
+
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+msgid "Greenfield"
+msgstr ""
+
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+msgid "Landfill"
+msgstr ""
+
+msgid "Edit Landfill Landuse"
msgstr ""
-msgid "Edit Military Landuse"
+msgid "Quarry"
msgstr ""
-msgid "Construction area"
+msgid "Edit Quarry Landuse"
msgstr ""
-msgid "Edit Construction Landuse"
+msgid "Annotation"
msgstr ""
-msgid "Brownfield"
+msgid "Edit Name Information"
msgstr ""
-msgid "Edit Brownfield Landuse"
+msgid "Alternative name"
msgstr ""
-msgid "Greenfield"
+msgid "Historical name"
msgstr ""
-msgid "Edit Greenfield Landuse"
+msgid "Local name"
msgstr ""
-msgid "Landfill"
+msgid "Regional name"
msgstr ""
-msgid "Edit Landfill Landuse"
+msgid "National name"
msgstr ""
-msgid "Quarry"
+msgid "International name"
msgstr ""
-msgid "Edit Quarry Landuse"
+msgid "Official name"
msgstr ""
-msgid "Annotation"
+msgid "Common name abbreviation"
msgstr ""
msgid "Edit Address Information"
@@ -18586,6 +19677,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18754,21 +19857,50 @@ 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 ""
+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 ""
@@ -18814,19 +19946,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"
@@ -18850,7 +19985,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18946,18 +20081,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 ""
@@ -18967,7 +20111,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18976,10 +20123,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18997,6 +20144,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19012,28 +20162,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"
@@ -19054,19 +20204,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"
@@ -19141,10 +20291,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19159,9 +20312,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"
@@ -19189,6 +20339,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19234,10 +20387,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"
@@ -19249,7 +20432,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"
@@ -19267,7 +20450,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19384,19 +20567,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 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"
@@ -19415,7 +20709,46 @@ 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 "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 "Landsat"
@@ -19427,19 +20760,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 "skobbler heatmap"
@@ -19460,7 +20802,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19469,6 +20811,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19615,6 +20960,29 @@ 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 ""
@@ -19780,6 +21148,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19825,6 +21196,39 @@ msgstr ""
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 "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "refresh the port list"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Connection Error."
+msgstr ""
+
+msgid "configure the connected DG100"
+msgstr ""
+
+msgid "delete data after import"
+msgstr ""
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -20011,19 +21415,31 @@ msgstr ""
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr ""
-msgid "No description provided. Please provide some description."
+msgid "No description provided. Please provide some description."
+msgstr ""
+
+msgid "Uploading GPX Track"
+msgstr ""
+
+msgid "Uploads traces to openstreetmap.org"
+msgstr ""
+
+msgid "Shows elevation profile"
+msgstr ""
+
+msgid "Elevation Profile"
msgstr ""
-msgid "Uploading GPX Track"
+msgid "Elevation Grid Layer (experimental!)"
msgstr ""
-msgid "Uploads traces to openstreetmap.org"
+msgid "Shows elevation grid layer"
msgstr ""
-msgid "Shows elevation profile"
+msgid "Elevation Grid"
msgstr ""
-msgid "Elevation Profile"
+msgid "No SRTM data"
msgstr ""
msgid "Open the elevation profile window."
@@ -20047,13 +21463,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20316,10 +21726,13 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20523,7 +21936,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"
@@ -20794,15 +22207,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20973,6 +22377,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 +22398,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21132,6 +22533,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 ""
@@ -21149,6 +22553,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 ""
@@ -21375,7 +22782,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."
@@ -21425,7 +22835,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21610,6 +23020,71 @@ msgstr ""
msgid "Show users on map"
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 ""
@@ -21649,27 +23124,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 ""
@@ -22747,9 +24204,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 ""
@@ -23396,9 +24870,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23451,18 +24922,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 ""
@@ -23809,6 +25268,27 @@ msgstr ""
msgid "Test failed: Could not write mtime."
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 ""
@@ -23960,6 +25440,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 ""
@@ -24277,9 +25760,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24495,6 +25975,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 ""
@@ -24527,15 +26010,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 ""
@@ -24650,9 +26149,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24831,19 +26327,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"
@@ -25059,6 +26555,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 ""
@@ -25095,6 +26680,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..."
@@ -25247,9 +26835,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26234,9 +27819,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26515,9 +28097,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 eb3cc43..d7ab3cb 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-08-04 03:41+0200\n"
-"PO-Revision-Date: 2013-05-11 04:56+0000\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-08-05 05:08+0000\n"
-"X-Generator: Launchpad (build 16718)\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,6 +50,9 @@ msgstr "背景使用条款"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "当前平台不支持打开链接(“{0}”)"
+msgid "ERROR: {0}"
+msgstr "错误：{0}"
+
msgid "WARNING: {0}"
msgstr "【警告】：{0}"
@@ -59,6 +62,9 @@ msgstr "【信息】：{0}"
msgid "DEBUG: {0}"
msgstr "【调试】：{0}"
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "执行平台启动挂钩中"
@@ -161,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 "
@@ -211,7 +217,7 @@ msgid "Add imagery layer {0}"
msgstr "添加图像层 {0}"
msgid "Select image format for WMS layer"
-msgstr ""
+msgstr "为WMS图层选择图像格式"
msgid "Select WMS layers"
msgstr "选择 WMS 图层"
@@ -252,9 +258,6 @@ msgstr "工具：{0}"
msgid "Please select at least four nodes."
msgstr "请至少选择 4 个节点。"
-msgid "Information"
-msgstr "信息"
-
msgid "Align Nodes in Line"
msgstr "排列节点为直线"
@@ -280,7 +283,7 @@ msgid "download"
msgstr "下载"
msgid "problem"
-msgstr ""
+msgstr "问题"
msgid "previous"
msgstr "上一个"
@@ -291,6 +294,9 @@ msgstr "下一个"
msgid "Nothing selected to zoom to."
msgstr "没有选择缩放的对象。"
+msgid "Information"
+msgstr "信息"
+
msgid "Zoom to {0}"
msgstr "缩放到 {0}"
@@ -345,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} 条路径"
@@ -521,6 +527,9 @@ msgstr "历史记录"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "显示 OSM 路径、节点或关系的历史记录信息。"
+msgid "Show history"
+msgstr "显示历史记录"
+
msgid "History (web)"
msgstr "历史记录(网页)"
@@ -636,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 "修正标签冲突"
@@ -789,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 "放弃合并"
@@ -977,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 "
@@ -1004,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>"
@@ -1170,9 +1170,6 @@ msgstr "加载会话"
msgid "Load a session from file."
msgstr "从文件中加载一个会话。"
-msgid "Session file (*.jos, *.joz)"
-msgstr "会话文件(*.jos, *.joz)"
-
msgid "Open session"
msgstr "打开会话"
@@ -1307,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} 个部分"
@@ -1403,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 "撤消"
@@ -1687,6 +1705,9 @@ 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})"
@@ -1904,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 "无法删除被多个对象参照的节点"
@@ -2348,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 "组合"
@@ -2552,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 "
@@ -2640,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}"
@@ -2676,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}”"
@@ -2701,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}”的冲突"
@@ -2799,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} 个节点"
@@ -2857,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 "关系"
@@ -2888,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 "关系中的角色参照到"
@@ -2912,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}"
@@ -2942,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 "
@@ -2962,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 "
@@ -2991,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}"
@@ -3022,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}”的冲突。"
@@ -3178,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."
@@ -3286,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)"
@@ -3324,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"
@@ -3367,6 +3393,9 @@ msgstr "验证其他的"
msgid "Running test {0}"
msgstr "执行测试 {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "地址"
@@ -3391,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 "建筑物内的建筑物"
@@ -3450,6 +3488,9 @@ msgstr " 或 "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0} 已过时，使用 {1} 代替"
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "重复的节点"
@@ -3532,6 +3573,15 @@ 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 "多重多边形"
@@ -3603,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 "重叠的区域"
@@ -3660,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})"
@@ -3698,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}"
@@ -3839,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 "找不到元件类型"
@@ -3914,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}"
@@ -3944,9 +4003,6 @@ msgstr "建筑"
msgid "area"
msgstr "区域"
-msgid "Unclosed way"
-msgstr "未封闭的路径"
-
msgid "Unconnected ways"
msgstr "未连接的路径"
@@ -3971,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”"
@@ -4037,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 "不要再显示(记住选择)"
@@ -4155,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 "无法取得当天的信息。"
@@ -4385,6 +4424,18 @@ 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 "音频(U)"
@@ -4489,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} 毫秒)"
@@ -4790,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"
@@ -4827,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 "下"
@@ -4876,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 "节点"
@@ -5135,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 "
@@ -5696,6 +5744,9 @@ msgstr "显示/隐藏"
msgid "Information about layer"
msgstr "关于图层的信息"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr "地图样式"
@@ -5778,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 "关系"
@@ -5867,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 "
@@ -6040,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 "下载并显示选定对象的历史记录"
@@ -6328,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 "不能创建匿名用户的开放修改集合查询"
@@ -6394,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 "改变关系"
@@ -6436,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)"
@@ -6593,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"
@@ -6913,16 +7002,35 @@ msgstr "路径已连接到下一个关系成员"
msgid "way is not connected to previous or next relation member"
msgstr "路径未连接到前一个或下一个关系成员"
-msgid "Bookmarks"
-msgstr "书签"
+msgid "{0} - {1} ({2})"
+msgstr ""
-msgid "<html>There is currently no download area selected.</html>"
-msgstr "<html>这里尚未选定下载区域。</html>"
+msgid "Wrong number of arguments for bookmark"
+msgstr "错误的书签参数值"
-msgid ""
-"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
-"maxlat): </html>"
-msgstr "<html><strong>目前的下载区域</strong>(最小经度, 最小纬度, 最大经度, 最大纬度)：</html>"
+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 "书签"
+
+msgid "<html>There is currently no download area selected.</html>"
+msgstr "<html>这里尚未选定下载区域。</html>"
+
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr "<html><strong>目前的下载区域</strong>(最小经度, 最小纬度, 最大经度, 最大纬度)：</html>"
msgid "Create bookmark"
msgstr "建立书签"
@@ -7046,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, "
@@ -7070,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 "类别类型"
@@ -7197,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 是空的。"
@@ -7296,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 "修改集合信息"
@@ -7392,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 "上传"
@@ -7413,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："
@@ -7479,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 的凭证"
@@ -7555,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 "
@@ -7571,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 "下载对象"
@@ -7785,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 "
@@ -7802,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 "返回到上一个对话框中输入一个更具描述性的注释"
@@ -7817,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 "取消上传并继续编辑"
@@ -7824,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 "正在准备要上传的对象..."
@@ -7944,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} 个对象..."
@@ -7955,6 +8060,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>"
@@ -7971,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 "请选择上传的方式："
@@ -8109,8 +8217,8 @@ msgstr "下一个标记"
msgid "Jump to next marker"
msgstr "跳至下一个标记"
-msgid "Previos marker"
-msgstr "前一个标记"
+msgid "Previous marker"
+msgstr ""
msgid "Jump to previous marker"
msgstr "跳至前一个标记"
@@ -8142,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"
@@ -8504,9 +8612,6 @@ msgstr "正在从 EXIF 中提取 GPS 位置"
msgid "Starting directory scan"
msgstr "开始扫描目录"
-msgid "One of the selected files was null"
-msgstr "选定的文件中有一个为空"
-
msgid "Read photos..."
msgstr "读取相片..."
@@ -8525,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 "有地理标记的图片"
@@ -8580,6 +8688,12 @@ msgstr "下一幅"
msgid "Show next Image"
msgstr "显示下一张图片"
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "置中查看"
@@ -8658,9 +8772,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 "自定义轨迹绘制"
@@ -8840,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}”中..."
@@ -8861,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 "非法的虚线模式，值必须为正"
@@ -8871,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 "访问令牌键："
@@ -9108,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 要求令牌"
@@ -9838,8 +9944,8 @@ msgstr "添加设置"
msgid "Advanced Background: Changed"
msgstr "高级背景：已更改"
-msgid "Advanced Background: NonDefalut"
-msgstr "高级背景：非默认"
+msgid "Advanced Background: NonDefault"
+msgstr ""
msgid "Current value is default."
msgstr "当前值是默认的。"
@@ -9906,6 +10012,9 @@ msgstr "在选择模式中，绘出虚拟节点"
msgid "Draw inactive layers in other color"
msgstr "将未使用的图层以其他颜色绘制"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr "高亮显示目标路径和节点"
@@ -9959,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 "影响绘制性能的选项"
@@ -10419,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 "文件备份"
@@ -10482,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"
@@ -10749,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"
@@ -10785,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}”"
@@ -10839,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 用户名："
@@ -10849,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. "
@@ -10945,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 "快捷键背景：用户"
@@ -11023,8 +11142,8 @@ msgstr "应用预设组合"
msgid "New relation"
msgstr "新建关系"
-msgid "Change Properties"
-msgstr "更改属性"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr "不明的必需品：{0}"
@@ -11102,9 +11221,6 @@ msgstr "预置无父元素的角色元素"
msgid "Preset sub element without parent"
msgstr "预置无父元素的子元素"
-msgid "Could not read tagging preset source: {0}"
-msgstr "无法读取标签预设组合来源：{0}"
-
msgid "Error parsing {0}: "
msgstr "分析 {0} 时发生错误： "
@@ -11123,6 +11239,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 "所有文件(*.*)"
@@ -11152,9 +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}”的节点。"
@@ -11185,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}”失败。"
@@ -11225,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 "正在分析服务器的回应..."
@@ -11344,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}。"
@@ -11359,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}。"
@@ -11442,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 输入失败！"
@@ -11541,47 +11713,23 @@ 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}”。"
+"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 "类型 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 "
-"({1},{2}). Skipping."
-msgstr "警告：在修改集合内容的位置({1},{2})有不支持的起始元素“{0}”。正在跳过。"
-
-msgid ""
-"Illegal document structure. Found node, way, or relation outside of "
-"''create'', ''modify'', or ''delete''."
-msgstr "不合法的文件结构。发现节点、路径或关系并非“create”、“modify”或“delete”。"
+"Illegal document structure. Found node, way, or relation outside of "
+"''create'', ''modify'', or ''delete''."
+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 "正在分析修改集合内容..."
@@ -11607,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>"
@@ -11696,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}。"
@@ -11895,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 "RemoteControl::Accepting connections on port {0}"
msgstr ""
@@ -11941,6 +12092,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."
@@ -11971,20 +12131,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: "
@@ -12005,11 +12165,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}”。"
@@ -12079,14 +12251,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}”"
@@ -12224,11 +12396,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 "停用插件"
@@ -12242,23 +12414,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}”"
@@ -12326,9 +12497,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 "正在处理插件网站的缓存图标文件..."
@@ -12342,10 +12512,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}”"
@@ -12683,13 +12868,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 "Failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr "警告：基于安全性理由无法访问目录“{0}”。异常为：{1}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
+msgstr ""
msgid "{0}... [please type its number]"
msgstr "{0}... [请输入其编号]"
@@ -12699,9 +12883,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 "安静快捷键冲突：“{0}”被“{1}”移动到“{2}”。"
@@ -12732,8 +12959,22 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
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] ""
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
@@ -13057,6 +13298,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 "以单一对话框进行群组通用地址填写的输入，同时也可以选择自动从路径产生个别门牌号码节点。"
@@ -13299,6 +13545,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."
@@ -13348,9 +13597,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 的编辑功能"
@@ -13387,6 +13633,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-数据的插件"
@@ -13517,6 +13768,9 @@ msgstr "路堤"
msgid "Lit"
msgstr "路灯"
+msgid "Toll"
+msgstr "收费"
+
msgid "Motorway Link"
msgstr "高速公路连络线"
@@ -13607,6 +13861,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 "生活街道"
@@ -13625,11 +13923,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 "巷/弄"
@@ -13640,6 +13938,9 @@ msgstr "车道"
msgid "parking_aisle"
msgstr "停车场通道"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "停车场通道"
@@ -13667,18 +13968,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 "没有出口(死路)"
@@ -13688,9 +13983,6 @@ msgstr "交通模式限制"
msgid "General Access"
msgstr "常规"
-msgid "destination"
-msgstr "仅目的地"
-
msgid "delivery"
msgstr "送交"
@@ -13700,15 +13992,15 @@ msgstr "有限"
msgid "private"
msgstr "私人"
+msgid "customers"
+msgstr "顾客"
+
msgid "agricultural"
msgstr "农业"
msgid "forestry"
msgstr "林业"
-msgid "no"
-msgstr "否"
-
msgid "official"
msgstr "官方"
@@ -13754,6 +14046,9 @@ msgstr "大容量车(hov)"
msgid "Public Service Vehicles (psv)"
msgstr "公共汽车(psv)"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "最低速度(km/h)"
@@ -13838,6 +14133,9 @@ msgstr "编辑桥梁"
msgid "viaduct"
msgstr "旱桥"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr "吊桥"
@@ -13942,20 +14240,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 "轮椅"
@@ -13972,11 +14279,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 "自行车路"
@@ -14011,8 +14318,8 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr "单行道(自行车)"
-msgid "Edit Highway"
-msgstr "编辑公路"
+msgid "Edit Highway Attributes:"
+msgstr ""
msgid "Highway"
msgstr "公路"
@@ -14080,12 +14387,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 "人行横道类型"
@@ -14101,15 +14414,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 "人行横道类型名称(英国)"
@@ -14131,6 +14435,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr "有人陪同穿越"
+
+msgid "Cross by bicycle"
+msgstr "以自行车穿越"
+
+msgid "Cross on horseback"
+msgstr "骑马穿越"
+
msgid "Stop"
msgstr "禁止通行"
@@ -14140,6 +14453,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "小型环岛"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "方向"
@@ -14149,11 +14465,8 @@ msgstr "顺时针"
msgid "Pedestrian Crossing"
msgstr "人行横道"
-msgid "Edit Crossing"
-msgstr "编辑人行横道"
-
-msgid "Type name (UK)"
-msgstr "类型名称(英国)"
+msgid "Edit Pedestrian Crossing"
+msgstr ""
msgid "Traffic Calming"
msgstr "道路减速设施"
@@ -14185,9 +14498,6 @@ msgstr ""
msgid "Passing Place"
msgstr "让车处"
-msgid "Edit Passing Place"
-msgstr "编辑让车处"
-
msgid "Turning Circle"
msgstr "回旋圈"
@@ -14230,6 +14540,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr "允许通行方向："
+msgid "Material"
+msgstr "材质"
+
+msgid "stone"
+msgstr "石头"
+
msgid "Bollard"
msgstr "车阻柱"
@@ -14245,6 +14561,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr "塑胶"
+
msgid "Cycle Barrier"
msgstr "自行车护栏"
@@ -14314,20 +14633,17 @@ msgstr ""
msgid "electric"
msgstr "电"
-msgid "roundpole"
-msgstr ""
-
-msgid "split_rail"
-msgstr ""
+msgid "pole"
+msgstr "杆"
-msgid "chain"
-msgstr "锁链"
+msgid "Guard Rail"
+msgstr ""
-msgid "hedge"
-msgstr "树篱"
+msgid "Edit Guard Rail"
+msgstr ""
-msgid "pole"
-msgstr "杆"
+msgid "wire"
+msgstr ""
msgid "Guard Rail"
msgstr ""
@@ -14357,8 +14673,9 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
-msgstr "编辑沟"
+msgstr ""
msgid "Kerb"
msgstr ""
@@ -14366,11 +14683,11 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
-msgstr "入口"
+msgid "Entrance (barrier opening)"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "编辑入口"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "门"
@@ -14423,12 +14740,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr "材质"
-
-msgid "stone"
-msgstr "石头"
-
msgid "Turnstile"
msgstr "旋转栅门"
@@ -14489,12 +14800,21 @@ msgstr "编辑渠"
msgid "Ditch"
msgstr "沟"
+msgid "Edit Ditch"
+msgstr "编辑沟"
+
msgid "Stream"
msgstr "溪流"
msgid "Edit Stream"
msgstr "编辑溪流"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "运河"
@@ -14534,9 +14854,6 @@ msgstr "编辑水坝"
msgid "Groyne"
msgstr "防波堤"
-msgid "Edit Groyne"
-msgstr "编辑防波堤"
-
msgid "Breakwater"
msgstr "防波堤"
@@ -14570,6 +14887,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 "陆地"
@@ -14651,20 +14983,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 "渡轮路线"
@@ -14738,8 +15075,8 @@ msgstr "旅游"
msgid "freight"
msgstr ""
-msgid "Service/Type"
-msgstr "类别"
+msgid "Service type"
+msgstr ""
msgid "yard"
msgstr "站线"
@@ -14762,11 +15099,14 @@ msgstr "接触网"
msgid "rail"
msgstr "第三轨"
-msgid "Voltage"
-msgstr "电压"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
-msgid "Frequency (Hz)"
-msgstr "频率(Hz)"
+msgid "16.67"
+msgstr ""
msgid "16.7"
msgstr "16.7"
@@ -14777,9 +15117,6 @@ msgstr "窄轨"
msgid "Edit Narrow Gauge Rail"
msgstr "编辑窄轨"
-msgid "Types"
-msgstr "类型"
-
msgid "Monorail"
msgstr "单轨"
@@ -14831,6 +15168,9 @@ msgstr ""
msgid "Level Crossing"
msgstr "铁路平交道"
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr "有人看管"
@@ -14843,18 +15183,32 @@ msgstr ""
msgid "Barrier"
msgstr "障碍物"
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
msgid "half"
-msgstr "半高"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "全高"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "double_half"
msgstr ""
msgid "Crossing"
msgstr "铁路人行道口"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "平交道类型"
@@ -14954,13 +15308,11 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
-msgstr "货物缆车"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
-msgstr "编辑货物缆车"
+msgstr ""
msgctxt "aerialway"
msgid "Station"
@@ -14970,13 +15322,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "编辑车站"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "吊塔"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "编辑吊塔"
+msgstr ""
msgid "Parking"
msgstr "停车场"
@@ -14993,12 +15343,12 @@ msgstr "平面"
msgid "underground"
msgstr "地下"
+msgid "rooftop"
+msgstr "屋顶"
+
msgid "Access"
msgstr "通行"
-msgid "customers"
-msgstr "顾客"
-
msgid "Park and Ride"
msgstr "停车换乘"
@@ -15026,9 +15376,6 @@ msgstr "停车位"
msgid "Edit Parking space"
msgstr "编辑停车位"
-msgid "rooftop"
-msgstr "屋顶"
-
msgid "Capacity"
msgstr "容量"
@@ -15050,11 +15397,30 @@ 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 "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "周二-周日 08:00-15:00；周六 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 "停车场入口"
@@ -15203,6 +15569,9 @@ msgstr "充电站"
msgid "Edit Charging Station (for electric cars)"
msgstr "编辑充电站(为电动车)"
+msgid "Voltage"
+msgstr "电压"
+
msgid "Amperage"
msgstr "安培数"
@@ -15224,6 +15593,12 @@ msgstr "修车场"
msgid "Edit Car Repair"
msgstr "编辑修车场"
+msgid "Parts"
+msgstr "零件"
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr "补胎处"
@@ -15251,6 +15626,12 @@ msgstr "租车"
msgid "Edit Car Rental"
msgstr "编辑租车"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr "只有"
+
msgid "Sharing"
msgstr "共享"
@@ -15275,22 +15656,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 "品牌"
@@ -15312,9 +15677,6 @@ msgstr "旧车性能检测"
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr "零件"
-
msgid "Clothes"
msgstr "服装店"
@@ -15509,6 +15871,9 @@ msgstr "站台"
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr "公交车"
@@ -15539,6 +15904,9 @@ msgstr "缆车"
msgid "Ferry"
msgstr "渡轮"
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "长椅"
@@ -15551,9 +15919,6 @@ msgstr "轮椅"
msgid "limited"
msgstr "有限"
-msgid "only"
-msgstr "只有"
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15563,9 +15928,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr "车站"
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "编辑车站"
+
msgid "Building"
msgstr "建筑物"
@@ -15578,6 +15948,9 @@ msgstr "编辑地铁入口"
msgid "Ticket Machine"
msgstr "自动售票机"
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr "编号"
@@ -15602,14 +15975,6 @@ msgstr "帐号或会员卡"
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr "车站"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "编辑车站"
-
msgid "UIC-Reference"
msgstr "国际铁路联盟编号"
@@ -15658,8 +16023,8 @@ msgstr "编辑公交车月台"
msgid "Taxi"
msgstr "出租车"
-msgid "Edit Taxi station"
-msgstr "编辑出租车招呼站"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "机场"
@@ -15712,6 +16077,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 "登机口"
@@ -15734,21 +16114,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 "吸烟"
@@ -15938,9 +16303,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "周二-周日 08:00-15:00；周六 08:00-12:00"
-
msgid "Tourism"
msgstr "旅游"
@@ -15962,9 +16324,15 @@ msgstr "眺望塔"
msgid "Information Office"
msgstr "信息服务处"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "地图"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr "详细等级"
@@ -15977,6 +16345,9 @@ msgstr "街"
msgid "scheme"
msgstr "设计图"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "显示区域"
@@ -16016,6 +16387,9 @@ msgstr "... 其他运输方式也可被接受"
msgid "Information Board"
msgstr "信息板"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "信息板内容"
@@ -16037,23 +16411,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 "休闲"
@@ -16182,50 +16568,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 "教派"
@@ -16242,8 +16622,14 @@ msgstr "天主教"
msgid "evangelical"
msgstr "福音派"
-msgid "jehovahs_witness"
-msgstr "耶和华见证"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
+msgid "jehovahs_witness"
+msgstr "耶和华见证"
msgid "lutheran"
msgstr "路德派"
@@ -16254,6 +16640,9 @@ msgstr "卫理公会教"
msgid "mormon"
msgstr "摩门教"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "东正教"
@@ -16272,38 +16661,138 @@ 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 "公共建筑"
@@ -16392,6 +16881,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 "健康"
@@ -16473,12 +16968,66 @@ msgstr "兽医"
msgid "Edit Veterinary"
msgstr "编辑兽医"
-msgid "Drinking water"
+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 "电话"
@@ -16488,6 +17037,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 "时钟"
@@ -16497,30 +17070,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 "可见性/可读性"
@@ -16549,8 +17128,8 @@ msgstr "显示湿度"
msgid "Recycling"
msgstr "回收"
-msgid "Edit Recycling station"
-msgstr "编辑回收站"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "电池"
@@ -16576,21 +17155,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 "plastic"
-msgstr "塑胶"
-
msgid "Amount of Seats"
msgstr "座椅数量"
@@ -16625,8 +17198,17 @@ msgstr "编辑狩猎站"
msgid "Height"
msgstr "高度"
+msgctxt "height"
msgid "low"
-msgstr "低"
+msgstr ""
+
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
msgid "Hide"
msgstr "隐藏"
@@ -16634,9 +17216,6 @@ msgstr "隐藏"
msgid "Lock"
msgstr "锁"
-msgid "Drinking Water"
-msgstr "饮水机"
-
msgid "Edit Source of Potable Water"
msgstr ""
@@ -16668,6 +17247,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr "直径(毫米)"
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr "车道"
@@ -16705,119 +17287,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 "运动中心"
@@ -16849,26 +17467,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瓶)"
@@ -16876,6 +17495,15 @@ msgstr "保龄球(9瓶)"
msgid "Edit 9pin"
msgstr "编辑保龄球(9瓶)"
+msgid "pitch"
+msgstr "场地"
+
+msgid "sports_centre"
+msgstr "运动中心"
+
+msgid "stadium"
+msgstr "体育场"
+
msgid "10pin"
msgstr "保龄球"
@@ -16909,6 +17537,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 "赛狗"
@@ -16965,7 +17609,7 @@ msgid "Skating"
msgstr "溜冰"
msgid "Edit Skating"
-msgstr "编辑溜冰"
+msgstr ""
msgid "ice_rink"
msgstr "溜冰场"
@@ -17009,36 +17653,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 ""
@@ -17081,19 +17743,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 ""
@@ -17232,6 +17890,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 "遥控车"
@@ -17244,38 +17914,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 "住宅楼"
@@ -17283,21 +17988,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 "塔"
@@ -17510,78 +18254,194 @@ msgstr "编辑灯塔"
msgid "Edit Beacon"
msgstr "编辑灯标"
-msgid "Street Lamp"
-msgstr "路灯"
+msgid "Street Lamp"
+msgstr "路灯"
+
+msgid "Edit Street Lamp"
+msgstr "编辑路灯"
+
+msgid "Operation times"
+msgstr "工作时间"
+
+msgid "Mo-Fr 22:00-05:00"
+msgstr "周一-周五 22：00-05：00"
+
+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 "Noise"
+msgstr ""
+
+msgid "GPS Signals"
+msgstr ""
+
+msgid "GLONASS Signals"
+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 "测量点"
+
+msgid "Edit Survey Point"
+msgstr "编辑测量点"
+
+msgid "Surveillance Camera"
+msgstr ""
+
+msgid "Edit Surveillance Camera"
+msgstr "编辑监控摄影机"
+
+msgid "indoor"
+msgstr "室内"
+
+msgid "outdoor"
+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 "Edit Street Lamp"
-msgstr "编辑路灯"
+msgid "Mounted on"
+msgstr ""
-msgid "Operation times"
-msgstr "工作时间"
+msgid "ceiling"
+msgstr ""
-msgid "Mo-Fr 22:00-05:00"
-msgstr "周一-周五 22：00-05：00"
+msgid "Direction in degrees"
+msgstr ""
-msgid "Measurement Station"
-msgstr "测量站"
+msgid "Inclination in degrees"
+msgstr ""
-msgid "Edit Measurement Station"
-msgstr "编辑测量站"
+msgid "Height in meter (m)"
+msgstr ""
-msgid "Measurement"
-msgstr "测量"
+msgid "Power"
+msgstr "电力"
-msgid "particulate_matter"
-msgstr "颗粒物"
+msgid "Power Plant"
+msgstr ""
-msgid "seismic"
-msgstr "地震"
+msgid "Edit Power Plant"
+msgstr ""
-msgid "water_level"
-msgstr "水位"
+msgid "Start date"
+msgstr ""
-msgid "weather"
-msgstr "天气"
+msgid "Output forms of energy"
+msgstr "能量输出形式"
-msgid "Recording"
-msgstr "记录"
+msgid "(please add this information to the generators if possible)"
+msgstr ""
-msgid "manually"
-msgstr "手动"
+msgid "electricity"
+msgstr "电"
-msgid "automated"
-msgstr "自动"
+msgid "2 W"
+msgstr "2 W"
-msgid "remote"
-msgstr "远程"
+msgid "3 kW"
+msgstr "3 kW"
-msgctxt "display"
-msgid "no"
-msgstr "无"
+msgid "5 MW"
+msgstr "5 MW"
-msgid "Survey Point"
-msgstr "测量点"
+msgid "7 GW"
+msgstr "7 GW"
-msgid "Edit Survey Point"
-msgstr "编辑测量点"
+msgid "hot water"
+msgstr "热水"
-msgid "Surveillance"
-msgstr "监控"
+msgid "hot air"
+msgstr "热气"
-msgid "Edit Surveillance Camera"
-msgstr "编辑监控摄影机"
+msgid "cold water"
+msgstr "冷水"
-msgid "indoor"
-msgstr "室内"
+msgid "cold air"
+msgstr "冷气"
-msgid "outdoor"
-msgstr "室外"
+msgid "compressed air"
+msgstr "压缩空气"
-msgid "public"
-msgstr "公共"
+msgid "steam"
+msgstr "蒸汽"
-msgid "Power"
-msgstr "电力"
+msgid "vacuum"
+msgstr "真空"
msgid "Power Generator"
msgstr "发电厂"
@@ -17634,89 +18494,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 "配电分站"
@@ -17727,6 +18690,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 "电缆配电柜"
@@ -17742,6 +18720,9 @@ msgstr "编辑电塔"
msgid "Tower reference"
msgstr "塔编号"
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr "电竿"
@@ -17760,13 +18741,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 "电缆数"
@@ -17873,11 +18852,11 @@ msgstr "售货亭"
msgid "Edit Kiosk"
msgstr "编辑售货亭"
-msgid "Baker"
-msgstr "面包店"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "编辑面包店"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "肉类"
@@ -17888,8 +18867,8 @@ msgstr "编辑肉店"
msgid "Seafood"
msgstr "海鲜"
-msgid "Edit Seafood"
-msgstr "编辑海鲜"
+msgid "Edit Seafood Shop"
+msgstr ""
msgid "Deli (Fine Food)"
msgstr "熟食店(美食)"
@@ -17909,6 +18888,9 @@ msgstr "市场"
msgid "Edit Marketplace"
msgstr "编辑市场"
+msgid "Organic"
+msgstr "有机"
+
msgid "Greengrocer"
msgstr "蔬果店"
@@ -17921,9 +18903,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr "有机"
-
msgid "Edit Organic/Bio"
msgstr "编辑有机/生物"
@@ -17993,8 +18972,8 @@ msgstr "编辑制衣店"
msgid "Fabric"
msgstr "布"
-msgid "Edit Fabric"
-msgstr "编辑布店"
+msgid "Edit Fabric Shop"
+msgstr ""
msgid "Electronic"
msgstr "电器"
@@ -18014,14 +18993,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"
@@ -18029,9 +19008,8 @@ msgstr "Hifi"
msgid "Edit Hifi Shop"
msgstr "编辑 Hifi 音响店"
-msgctxt "shop"
msgid "Video"
-msgstr "影像"
+msgstr "影片"
msgid "Edit Video Shop"
msgstr "编辑影像店"
@@ -18057,6 +19035,12 @@ msgstr "编辑货币兑换所"
msgid "Edit Automated Teller Machine"
msgstr "编辑自动柜员机"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr "百货商店"
@@ -18093,11 +19077,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 "花类"
@@ -18126,8 +19131,8 @@ msgstr "编辑硬件商店"
msgid "Paint"
msgstr "油漆"
-msgid "Edit Paint"
-msgstr "编辑油漆"
+msgid "Edit Paint Shop"
+msgstr ""
msgid "Furniture"
msgstr "家俱"
@@ -18138,20 +19143,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 "文具"
@@ -18186,8 +19191,8 @@ msgstr "编辑旅行社"
msgid "Musical Instrument"
msgstr "乐器"
-msgid "Edit Musical Instruments"
-msgstr "编辑乐器"
+msgid "Edit Musical Instruments Shop"
+msgstr ""
msgid "Toys"
msgstr "玩具"
@@ -18399,6 +19404,12 @@ msgstr "山峰"
msgid "Edit Peak"
msgstr "编辑山峰"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "冰川"
@@ -18438,24 +19449,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 "混合"
@@ -18465,15 +19485,6 @@ msgstr "森林"
msgid "Edit Forest Landuse"
msgstr "编辑森林土地利用"
-msgid "coniferous"
-msgstr "松类"
-
-msgid "deciduous"
-msgstr "落叶类"
-
-msgid "mixed"
-msgstr "混合"
-
msgid "Grassland"
msgstr ""
@@ -18549,6 +19560,12 @@ msgstr "牧场"
msgid "Edit Meadow Landuse"
msgstr "编辑牧场"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "葡萄园"
@@ -18603,8 +19620,8 @@ msgstr "游乐场"
msgid "Edit Recreation Ground Landuse"
msgstr "编辑游乐场用地"
-msgid "Residential area"
-msgstr "居住区"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "编辑居住区"
@@ -18615,6 +19632,9 @@ msgstr "教堂附近的墓地"
msgid "Edit Graveyard"
msgstr "编辑墓地"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "不靠近教堂的墓地"
@@ -18690,6 +19710,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 "编辑地址信息"
@@ -18726,6 +19773,18 @@ msgstr "偶数"
msgid "alphabetic"
msgstr "按字母顺序"
+msgid "Accuracy"
+msgstr "精度"
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr "联系(普通方式)"
@@ -18894,20 +19953,49 @@ msgstr ""
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 "步行"
+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 "符号说明"
@@ -18954,20 +20042,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 "街"
@@ -18990,8 +20081,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 "写于标志上的目的地(和/或距离)"
@@ -19086,18 +20177,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 "马"
@@ -19107,8 +20207,11 @@ msgstr "障碍"
msgid "motorroad"
msgstr "机动车专用道"
-msgid "highway_track"
-msgstr "公路轨迹"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "服务"
@@ -19116,11 +20219,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 "河堤"
@@ -19137,6 +20240,9 @@ msgstr "急流"
msgid "railwaypoint"
msgstr "铁路点"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr "铁路车场"
@@ -19152,29 +20258,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 "塔"
@@ -19194,20 +20300,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 "旅馆"
@@ -19281,10 +20387,13 @@ msgstr "路线"
msgid "boundary"
msgstr "边界"
+msgid "sport"
+msgstr "运动"
+
msgid "place"
msgstr "地点"
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19299,9 +20408,6 @@ msgstr "村/市"
msgid "One Way"
msgstr "单行道"
-msgid "Church"
-msgstr "教堂"
-
msgid "Fuel Station"
msgstr "加油站"
@@ -19329,6 +20435,9 @@ msgstr "节点上的桥梁标签"
msgid "wrong highway tag on a node"
msgstr "节点上的错误公路标签"
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr "未命名的未分类公路"
@@ -19374,10 +20483,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"
@@ -19389,7 +20528,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"
@@ -19407,7 +20546,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19524,19 +20663,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 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"
@@ -19555,7 +20805,46 @@ 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 "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 "Landsat"
@@ -19567,19 +20856,25 @@ 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"
@@ -19600,7 +20895,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19609,6 +20904,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19675,19 +20973,19 @@ msgstr ""
msgid "Estonia Multi (Maaamet)"
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 "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
@@ -19696,16 +20994,16 @@ msgstr ""
msgid "Géobretagne - Brest 2010 - 10 cm"
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 "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -19714,13 +21012,16 @@ msgstr ""
msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Slovakia Historic Maps"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "South Africa CD:NGI Aerial"
msgstr ""
msgid ""
@@ -19755,6 +21056,29 @@ 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 ""
@@ -19920,6 +21244,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19965,6 +21292,39 @@ msgstr ""
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 "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 "Columbus V-900 CSV 文件"
@@ -20166,6 +21526,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 "打开高度轮廓窗口。"
@@ -20187,14 +21559,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}”的高度配置文件。"
@@ -20460,10 +21826,13 @@ msgstr "选择不完整的地址"
msgid "Selects all addresses with incomplete data."
msgstr "选择有不完整数据的所有地址。"
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr "门牌号编辑器"
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20581,6 +21950,18 @@ msgstr ""
msgid "OSM Inspector Bugs"
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 ""
@@ -20668,8 +22049,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 个字节"
@@ -21012,15 +22393,6 @@ msgstr "门牌号码："
msgid "Street Name:"
msgstr "街道名称："
-msgid "Increment"
-msgstr "递增"
-
-msgid "Decrement"
-msgstr "递减"
-
-msgid "Numbers:"
-msgstr "号码："
-
msgid "Big buildings mode"
msgstr "大型建筑模式"
@@ -21203,6 +22575,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 图层。"
@@ -21221,12 +22596,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "高"
-
-msgid "medium"
-msgstr "中"
-
msgid "symbol"
msgstr "符号"
@@ -21367,6 +22736,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 ""
@@ -21384,6 +22756,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=...”添加到元件？"
@@ -21620,8 +22995,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 "是矢量化的。"
@@ -21672,8 +23050,8 @@ msgstr "从列表中删除选定的配置。"
msgid "Color Schemes"
msgstr "颜色配置"
-msgid "Adress"
-msgstr "地址"
+msgid "Address"
+msgstr ""
msgid "Split area"
msgstr "分离区域"
@@ -21901,27 +23279,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 "从装置输入数据"
@@ -23012,9 +24372,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 "密歇根左转"
@@ -23658,9 +25035,6 @@ msgstr "<html>选定的数据包含来自 OpenStreetBugs 的数据。<br>您不
msgid "An error occurred: {0}"
msgstr "发生一个错误：{0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "无法建立新的错误报告。结果：{0}"
-
msgid "Process queue"
msgstr "进程队列"
@@ -23713,18 +25087,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 "在浏览器中打开"
@@ -24071,6 +25433,27 @@ msgstr "测试失败：无法读取 mtime。"
msgid "Test failed: Could not write mtime."
msgstr "测试失败：无法写入 mtime。"
+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} 吗？"
@@ -24224,6 +25607,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 ""
@@ -24541,9 +25927,6 @@ msgstr "GPX 文件中不包含轨迹或路点。"
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr "轨迹"
-
msgid "Tracks in this GPX file:"
msgstr "这个 GPX 文件中的轨迹："
@@ -24759,6 +26142,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} 的合并目标"
@@ -24793,15 +26179,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 "预设国家："
@@ -24916,9 +26318,6 @@ msgstr "路线规划插件首选项"
msgid "Configure routing preferences."
msgstr "设定路线规划首选项"
-msgid "Highway type"
-msgstr "公路类型"
-
msgid "Speed (Km/h)"
msgstr "速度限制(Km/h)"
@@ -25099,20 +26498,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 "自动保存即时数据"
@@ -25327,6 +26726,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"
@@ -25365,6 +26853,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..."
@@ -25525,9 +27016,6 @@ msgstr "签署已取消！"
msgid "Please give a tolerance in meters"
msgstr "请给出一个容差(米)"
-msgid "Accuracy"
-msgstr "精度"
-
msgid "Select as much as you like:"
msgstr "选择您想要的："
@@ -26544,9 +28032,6 @@ msgstr "取消选定节点"
msgid "Removes all nodes from selection"
msgstr "删除选择范围中所有的节点"
-msgid "Video"
-msgstr "影片"
-
msgid "Import Video"
msgstr "导入视频"
@@ -26827,9 +28312,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_TW.po b/i18n/po/zh_TW.po
index aa4dccc..0c9c244 100644
--- a/i18n/po/zh_TW.po
+++ b/i18n/po/zh_TW.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-04 03:41+0200\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"
@@ -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-08-05 05:07+0000\n"
-"X-Generator: Launchpad (build 16718)\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,9 @@ msgstr "背景使用條款"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "目前的平臺不支援開啟連結(「{0}」)"
+msgid "ERROR: {0}"
+msgstr ""
+
msgid "WARNING: {0}"
msgstr ""
@@ -59,6 +62,9 @@ msgstr ""
msgid "DEBUG: {0}"
msgstr ""
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "執行平臺啟動掛鉤"
@@ -161,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 "
@@ -252,9 +258,6 @@ msgstr "工具：{0}"
msgid "Please select at least four nodes."
msgstr "請選取至少四個節點"
-msgid "Information"
-msgstr "資訊"
-
msgid "Align Nodes in Line"
msgstr "對齊在直線裡的節點"
@@ -291,6 +294,9 @@ msgstr "下一級"
msgid "Nothing selected to zoom to."
msgstr "沒有選擇要縮放的物件。"
+msgid "Information"
+msgstr "資訊"
+
msgid "Zoom to {0}"
msgstr "縮放至 {0}"
@@ -345,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} 條路徑"
@@ -521,6 +527,9 @@ msgstr "歷史紀錄"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "顯示 OSM 路徑、節點或關係的歷史紀錄資訊。"
+msgid "Show history"
+msgstr "顯示歷史紀錄"
+
msgid "History (web)"
msgstr "歷史 (網頁)"
@@ -636,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 "修正標籤的衝突"
@@ -786,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 "放棄合併"
@@ -972,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 "
@@ -999,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>"
@@ -1165,9 +1165,6 @@ msgstr "載入作業階段"
msgid "Load a session from file."
msgstr "從檔案載入作業階段。"
-msgid "Session file (*.jos, *.joz)"
-msgstr "作業階段檔案 (*.jos, *.joz)"
-
msgid "Open session"
msgstr "開啟作業階段"
@@ -1302,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} 個部分"
@@ -1399,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 "復原"
@@ -1681,6 +1699,9 @@ 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})"
@@ -1898,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 "不能刪除由多個物件參照的節點"
@@ -2333,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 ""
@@ -2535,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 "
@@ -2622,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}"
@@ -2658,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}」"
@@ -2683,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}」衝突"
@@ -2782,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} 個節點"
@@ -2839,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 "關係"
@@ -2870,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 "關係中的角色參照到"
@@ -2894,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}"
@@ -2924,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 "
@@ -2944,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 "
@@ -2973,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}"
@@ -3004,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}」的衝突。"
@@ -3158,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 ""
@@ -3266,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 ""
@@ -3304,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"
@@ -3347,6 +3373,9 @@ msgstr "驗證其他的"
msgid "Running test {0}"
msgstr "執行測試 {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "地址"
@@ -3371,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 "建築物中的建築"
@@ -3430,6 +3468,9 @@ msgstr " 或 "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0} 已廢棄，使用 {1} 代替"
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "重複的節點"
@@ -3512,6 +3553,15 @@ 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 "多重多邊形"
@@ -3581,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 "重疊的區域"
@@ -3638,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})"
@@ -3676,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}"
@@ -3817,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 "找不到元件類型"
@@ -3892,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}"
@@ -3922,9 +3981,6 @@ msgstr "建築"
msgid "area"
msgstr "區域"
-msgid "Unclosed way"
-msgstr "未封閉的路徑"
-
msgid "Unconnected ways"
msgstr "未連接路徑"
@@ -3949,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」"
@@ -4015,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 "不要再顯示（記住選擇）"
@@ -4133,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 "無法取得當天的訊息。"
@@ -4363,6 +4402,18 @@ 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 "音效"
@@ -4467,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} 毫秒)"
@@ -4769,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"
@@ -4806,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 "下"
@@ -4855,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 "節點"
@@ -5109,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 "
@@ -5646,6 +5694,9 @@ msgstr "顯示/隱藏"
msgid "Information about layer"
msgstr "關於圖層的資訊"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr "地圖繪製樣式"
@@ -5729,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 "關係"
@@ -5818,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 "
@@ -5991,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 "下載並顯示選取物件的歷史紀錄"
@@ -6279,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 "對匿名使用者不能建立開放變更組合的建立變更組合查詢"
@@ -6345,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 "改變關係"
@@ -6387,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)"
@@ -6542,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"
@@ -6861,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 "書籤"
@@ -6994,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, "
@@ -7018,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 "類別類型"
@@ -7138,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 是空的。"
@@ -7237,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 "變更組合資訊"
@@ -7332,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 "上傳"
@@ -7351,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："
@@ -7417,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 的憑證"
@@ -7493,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 ""
@@ -7510,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 "下載物件.."
@@ -7724,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 "
@@ -7741,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 "回到前一個對話盒以輸入更多描述性備註"
@@ -7756,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 "取消上傳並繼續編輯"
@@ -7763,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 "正在準備要上傳的物件..."
@@ -7883,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} 個物件..."
@@ -7894,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>"
@@ -7910,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 "請選擇上傳的方式："
@@ -8048,7 +8158,7 @@ msgstr "下個標記"
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8078,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"
@@ -8435,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 "讀取相片..."
@@ -8456,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 的圖片"
@@ -8511,6 +8621,12 @@ msgstr "下一幅"
msgid "Show next Image"
msgstr "顯示下一張圖片"
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "置中檢視"
@@ -8583,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 ""
@@ -8765,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}」..."
@@ -8787,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 ""
@@ -8797,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 "存取記號鍵："
@@ -9031,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 要求記號"
@@ -9737,6 +9845,42 @@ msgstr ""
msgid "Entry {0}"
msgstr "項目 {0}"
+msgid "Reset preferences"
+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 "Load profile"
+msgstr ""
+
+msgid "Save {0} profile"
+msgstr ""
+
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
+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 "Select Setting Type:"
msgstr "選擇設定類型："
@@ -9826,6 +9970,9 @@ msgstr "在選擇模式繪出虛擬節點"
msgid "Draw inactive layers in other color"
msgstr "將未使用的圖層以其他顏色繪製"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr "突顯目標路徑和節點"
@@ -9879,6 +10026,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 "影響繪製效率的選項"
@@ -10339,6 +10491,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 "檔案備份"
@@ -10402,8 +10560,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"
@@ -10670,21 +10828,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"
@@ -10706,6 +10849,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}」"
@@ -10760,8 +10918,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:"
@@ -10770,21 +10928,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. "
@@ -10866,15 +11029,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 ""
@@ -10944,8 +11101,8 @@ msgstr "套用預設組合"
msgid "New relation"
msgstr "新關係"
-msgid "Change Properties"
-msgstr "改變屬性"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr "不明的必需品：{0}"
@@ -11025,9 +11182,6 @@ msgstr "沒有父項的預設組合角色元素"
msgid "Preset sub element without parent"
msgstr "沒有父項的子元素"
-msgid "Could not read tagging preset source: {0}"
-msgstr "無法讀取標籤預設組合來源：{0}"
-
msgid "Error parsing {0}: "
msgstr "分析 {0} 時發生錯誤： "
@@ -11046,6 +11200,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 ""
@@ -11075,9 +11237,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}」的節點。"
@@ -11108,9 +11310,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}」。"
@@ -11148,30 +11350,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 "正在分析伺服器的回應..."
@@ -11267,6 +11466,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}。"
@@ -11282,13 +11484,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 ""
@@ -11365,8 +11575,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 匯入失敗！"
@@ -11464,37 +11674,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 "
@@ -11502,9 +11688,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 "正在分析變更組合內容 ..."
@@ -11530,11 +11716,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>"
@@ -11617,9 +11800,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}。"
@@ -11816,7 +11999,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 "RemoteControl::Accepting connections on port {0}"
@@ -11862,6 +12051,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."
@@ -11892,20 +12090,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: "
@@ -11926,11 +12124,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 ""
@@ -12000,14 +12210,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}」"
@@ -12147,11 +12357,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 "停用外掛程式"
@@ -12165,23 +12375,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}」"
@@ -12249,9 +12458,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 "正在處理外掛程式網站快取圖示檔案..."
@@ -12265,10 +12473,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}」"
@@ -12602,13 +12825,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 "Failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr "警告：基於安全性理由無法存取目錄「{0}」。例外為：{1}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
+msgstr ""
msgid "{0}... [please type its number]"
msgstr ""
@@ -12618,9 +12840,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 ""
@@ -12652,9 +12917,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."
@@ -12977,6 +13256,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 "以單一對話盒進行群組通用地址填寫的輸入，同時也可以選擇自動從路徑產生個別門牌號碼節點。"
@@ -13219,6 +13503,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."
@@ -13268,9 +13555,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 ""
@@ -13307,6 +13591,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 的外掛程式"
@@ -13437,6 +13726,9 @@ msgstr "堤防"
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "通行費"
+
msgid "Motorway Link"
msgstr "高速公路連絡道路"
@@ -13527,6 +13819,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 "生活街道"
@@ -13545,11 +13881,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 "巷/弄"
@@ -13560,6 +13896,9 @@ msgstr "車道"
msgid "parking_aisle"
msgstr "停車場通道"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "停車場通道"
@@ -13587,18 +13926,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 "沒有出口（死路）"
@@ -13608,9 +13941,6 @@ msgstr ""
msgid "General Access"
msgstr "一般通行"
-msgid "destination"
-msgstr "目的地"
-
msgid "delivery"
msgstr ""
@@ -13620,15 +13950,15 @@ msgstr "隨意的"
msgid "private"
msgstr "私人的"
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr "農業的"
msgid "forestry"
msgstr "林業"
-msgid "no"
-msgstr "否"
-
msgid "official"
msgstr "正式的"
@@ -13674,6 +14004,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr "公共汽車 (psv)"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "最低限速 (km/h)"
@@ -13758,6 +14091,9 @@ msgstr "編輯橋樑"
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13862,20 +14198,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 "輪椅"
@@ -13892,10 +14237,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"
@@ -13931,7 +14276,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -14000,12 +14345,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 "行人穿越道類型"
@@ -14021,15 +14372,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 "行人穿越道類型名稱 (英國)"
@@ -14051,6 +14393,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr "有人陪同穿越"
+
+msgid "Cross by bicycle"
+msgstr "以自行車穿越"
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr "禁止通行"
@@ -14060,6 +14411,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "小型圓環"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "方向"
@@ -14069,11 +14423,8 @@ msgstr "順時針"
msgid "Pedestrian Crossing"
msgstr "行人穿越道"
-msgid "Edit Crossing"
-msgstr "編輯行人穿越道"
-
-msgid "Type name (UK)"
-msgstr "類型名稱 (英國)"
+msgid "Edit Pedestrian Crossing"
+msgstr ""
msgid "Traffic Calming"
msgstr "道路減速設施"
@@ -14105,9 +14456,6 @@ msgstr ""
msgid "Passing Place"
msgstr "讓車處"
-msgid "Edit Passing Place"
-msgstr "編輯讓車處"
-
msgid "Turning Circle"
msgstr "迴旋圈"
@@ -14150,6 +14498,12 @@ msgstr ""
msgid "Allowed traffic:"
msgstr "允許通行方向："
+msgid "Material"
+msgstr "材質"
+
+msgid "stone"
+msgstr "石頭"
+
msgid "Bollard"
msgstr "車阻柱"
@@ -14165,6 +14519,9 @@ msgstr ""
msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr "塑膠"
+
msgid "Cycle Barrier"
msgstr "自行車護欄"
@@ -14234,19 +14591,16 @@ msgstr ""
msgid "electric"
msgstr ""
-msgid "roundpole"
-msgstr ""
-
-msgid "split_rail"
+msgid "pole"
msgstr ""
-msgid "chain"
+msgid "Guard Rail"
msgstr ""
-msgid "hedge"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "pole"
+msgid "wire"
msgstr ""
msgid "Guard Rail"
@@ -14277,8 +14631,9 @@ msgctxt "Barrier"
msgid "Ditch"
msgstr ""
+msgctxt "Barrier"
msgid "Edit Ditch"
-msgstr "編輯渠道"
+msgstr ""
msgid "Kerb"
msgstr ""
@@ -14286,11 +14641,11 @@ msgstr ""
msgid "Edit Kerb"
msgstr ""
-msgid "Entrance"
-msgstr "入口"
+msgid "Entrance (barrier opening)"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "編輯入口"
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "閘門"
@@ -14343,12 +14698,6 @@ msgstr ""
msgid "stepover"
msgstr ""
-msgid "Material"
-msgstr "材質"
-
-msgid "stone"
-msgstr "石頭"
-
msgid "Turnstile"
msgstr "旋轉柵門"
@@ -14409,12 +14758,21 @@ msgstr "編輯排水溝"
msgid "Ditch"
msgstr "渠道"
+msgid "Edit Ditch"
+msgstr "編輯渠道"
+
msgid "Stream"
msgstr "溪流"
msgid "Edit Stream"
msgstr "編輯溪流"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "運河"
@@ -14454,9 +14812,6 @@ msgstr "編輯水壩"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14490,6 +14845,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 "陸地"
@@ -14571,20 +14941,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 "渡輪路線"
@@ -14658,7 +15033,7 @@ msgstr "旅遊"
msgid "freight"
msgstr ""
-msgid "Service/Type"
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14682,11 +15057,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"
@@ -14697,9 +15075,6 @@ msgstr "窄軌"
msgid "Edit Narrow Gauge Rail"
msgstr "編輯窄軌"
-msgid "Types"
-msgstr "類型"
-
msgid "Monorail"
msgstr "單軌"
@@ -14751,6 +15126,9 @@ msgstr ""
msgid "Level Crossing"
msgstr "鐵路平交道"
+msgid "Edit Level Crossing"
+msgstr ""
+
msgid "Supervised"
msgstr "有管理員"
@@ -14763,18 +15141,32 @@ msgstr ""
msgid "Barrier"
msgstr ""
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
msgid "half"
-msgstr "半高"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "full"
-msgstr "全高"
+msgstr ""
+msgctxt "crossing:barrier"
msgid "double_half"
msgstr ""
msgid "Crossing"
msgstr "平交道"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "平交道類型"
@@ -14874,13 +15266,11 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
-msgstr "貨物纜車"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
-msgstr "編輯貨物貨物"
+msgstr ""
msgctxt "aerialway"
msgid "Station"
@@ -14890,13 +15280,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "編輯纜車站"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "塔柱"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "編輯塔柱"
+msgstr ""
msgid "Parking"
msgstr "停車場"
@@ -14913,12 +15301,12 @@ msgstr "平面式"
msgid "underground"
msgstr "地下"
+msgid "rooftop"
+msgstr ""
+
msgid "Access"
msgstr "使用"
-msgid "customers"
-msgstr ""
-
msgid "Park and Ride"
msgstr ""
@@ -14946,9 +15334,6 @@ msgstr "停車格"
msgid "Edit Parking space"
msgstr "編輯停車格"
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "容量"
@@ -14970,11 +15355,30 @@ 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 "停車場入口"
@@ -15123,6 +15527,9 @@ msgstr "充電站"
msgid "Edit Charging Station (for electric cars)"
msgstr "編輯充電站（電動車輛用）"
+msgid "Voltage"
+msgstr "電壓"
+
msgid "Amperage"
msgstr ""
@@ -15144,6 +15551,12 @@ msgstr "修車場"
msgid "Edit Car Repair"
msgstr "編輯修車場"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr "輪胎"
@@ -15171,6 +15584,12 @@ msgstr "租車"
msgid "Edit Car Rental"
msgstr "編輯租車"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "汽車分享"
@@ -15195,22 +15614,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 ""
@@ -15232,9 +15635,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "衣服"
@@ -15429,6 +15829,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15459,6 +15862,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "長椅"
@@ -15471,9 +15877,6 @@ msgstr "輪椅"
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15483,8 +15886,13 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
-msgstr ""
+msgstr "火車站"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "編輯火車站"
msgid "Building"
msgstr "建築物"
@@ -15498,6 +15906,9 @@ msgstr "編輯地下鐵入口"
msgid "Ticket Machine"
msgstr "售票機"
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15522,14 +15933,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr "火車站"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "編輯火車站"
-
msgid "UIC-Reference"
msgstr "UIC-參考"
@@ -15578,8 +15981,8 @@ msgstr "編輯公車月台"
msgid "Taxi"
msgstr "計程車"
-msgid "Edit Taxi station"
-msgstr "編輯計程車招呼站"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "機場"
@@ -15632,6 +16035,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 "登機門"
@@ -15654,21 +16072,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 "吸菸區"
@@ -15858,9 +16261,6 @@ msgstr ""
msgid "Edit Stripclub"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "週二-週日 08:00-15:00; 週六 08:00-12:00"
-
msgid "Tourism"
msgstr "旅遊相關"
@@ -15882,9 +16282,15 @@ msgstr ""
msgid "Information Office"
msgstr "資訊服務處"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "地圖"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15897,6 +16303,9 @@ msgstr "街"
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "顯示區域"
@@ -15936,6 +16345,9 @@ msgstr "... 其他可能的運輸模式"
msgid "Information Board"
msgstr "資訊板"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "板的內容"
@@ -15957,23 +16369,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 "休閒"
@@ -16102,51 +16526,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 "教派"
@@ -16162,6 +16580,12 @@ msgstr "天主教"
msgid "evangelical"
msgstr "福音派教會"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16174,6 +16598,9 @@ msgstr "衛理公會教"
msgid "mormon"
msgstr "摩門教"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "東正教"
@@ -16192,38 +16619,138 @@ msgstr "教友派"
msgid "roman_catholic"
msgstr ""
-msgid "shia"
-msgstr "什葉派"
+msgid "russian_orthodox"
+msgstr ""
-msgid "sunni"
-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 "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 "公共建築"
@@ -16312,6 +16839,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 "健康"
@@ -16393,12 +16926,66 @@ msgstr "獸醫"
msgid "Edit Veterinary"
msgstr "編輯獸醫"
-msgid "Drinking water"
+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 "電話"
@@ -16408,6 +16995,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 "時鐘"
@@ -16417,31 +17028,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 "能見度/可讀性"
@@ -16469,8 +17086,8 @@ msgstr "顯示溼度"
msgid "Recycling"
msgstr "資源回收"
-msgid "Edit Recycling station"
-msgstr "資源回收站"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "電池"
@@ -16496,21 +17113,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 "plastic"
-msgstr "塑膠"
-
msgid "Amount of Seats"
msgstr "座椅數量"
@@ -16545,8 +17156,17 @@ msgstr ""
msgid "Height"
msgstr "高度"
+msgctxt "height"
msgid "low"
-msgstr "低"
+msgstr ""
+
+msgctxt "height"
+msgid "half"
+msgstr ""
+
+msgctxt "height"
+msgid "full"
+msgstr ""
msgid "Hide"
msgstr "隱藏"
@@ -16554,9 +17174,6 @@ msgstr "隱藏"
msgid "Lock"
msgstr "鎖"
-msgid "Drinking Water"
-msgstr "飲水機"
-
msgid "Edit Source of Potable Water"
msgstr ""
@@ -16588,6 +17205,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16625,119 +17245,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 "運動中心"
@@ -16769,26 +17425,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 ""
@@ -16796,6 +17453,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr "運動中心"
+
+msgid "stadium"
+msgstr "體育館"
+
msgid "10pin"
msgstr ""
@@ -16829,6 +17495,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 "賽狗"
@@ -16885,7 +17567,7 @@ msgid "Skating"
msgstr "溜冰"
msgid "Edit Skating"
-msgstr "編輯溜冰"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -16929,36 +17611,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 ""
@@ -17001,19 +17701,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 ""
@@ -17152,6 +17848,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 ""
@@ -17164,38 +17872,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 "居住的建築"
@@ -17203,21 +17946,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 "塔"
@@ -17442,41 +18224,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"
@@ -17485,8 +18293,8 @@ msgstr "測量點"
msgid "Edit Survey Point"
msgstr "編輯測量點"
-msgid "Surveillance"
-msgstr "監視"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "編輯監視攝影機"
@@ -17497,12 +18305,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 ""
+
+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 "發電機組"
@@ -17554,89 +18452,192 @@ 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 "battery charging"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "Power Station"
-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 "編輯發電廠"
+msgid "Output forms of energy:"
+msgstr ""
msgid "Power Sub Station"
msgstr ""
@@ -17647,6 +18648,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 ""
@@ -17662,6 +18678,9 @@ msgstr "編輯電塔"
msgid "Tower reference"
msgstr "高壓電塔編號"
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr "電線竿"
@@ -17680,11 +18699,9 @@ msgstr "編輯電線"
msgid "Line type"
msgstr "電線類型"
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17793,11 +18810,11 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
-msgstr "麵包類"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "編輯麵包店"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "肉類"
@@ -17808,8 +18825,8 @@ msgstr "編輯肉店"
msgid "Seafood"
msgstr "海產"
-msgid "Edit Seafood"
-msgstr "編輯海產"
+msgid "Edit Seafood Shop"
+msgstr ""
msgid "Deli (Fine Food)"
msgstr ""
@@ -17829,6 +18846,9 @@ msgstr "市場"
msgid "Edit Marketplace"
msgstr "編輯市場"
+msgid "Organic"
+msgstr "有機產品"
+
msgid "Greengrocer"
msgstr ""
@@ -17841,9 +18861,6 @@ msgstr ""
msgid "Edit Farm Stand"
msgstr ""
-msgid "Organic"
-msgstr "有機產品"
-
msgid "Edit Organic/Bio"
msgstr ""
@@ -17913,7 +18930,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17934,14 +18951,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"
@@ -17949,9 +18966,8 @@ msgstr "Hifi"
msgid "Edit Hifi Shop"
msgstr "編輯 Hifi 音響店"
-msgctxt "shop"
msgid "Video"
-msgstr ""
+msgstr "影片類"
msgid "Edit Video Shop"
msgstr "編輯影片類商店"
@@ -17977,6 +18993,12 @@ msgstr "編輯金錢兌換所"
msgid "Edit Automated Teller Machine"
msgstr "編輯自動提款機"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr "百貨公司"
@@ -18007,17 +19029,38 @@ msgstr "眼鏡類"
msgid "Edit Optician"
msgstr "編輯眼鏡行"
-msgid "Jewelry"
-msgstr "珠寶"
+msgid "Jewelry"
+msgstr "珠寶"
+
+msgid "Edit Jewelry"
+msgstr "編輯珠寶"
+
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr "佛教"
+
+msgid "christian"
+msgstr "基督教系"
+
+msgid "hindu"
+msgstr "印度教"
-msgid "Edit Jewelry"
-msgstr "編輯珠寶"
+msgid "jewish"
+msgstr "猶太教"
+
+msgid "muslim"
+msgstr "回教"
msgid "Erotic"
msgstr "情趣用品"
-msgid "Edit Erotic"
-msgstr "編輯情趣用品"
+msgid "Edit Erotic Shop"
+msgstr ""
msgid "Florist"
msgstr "花類"
@@ -18046,7 +19089,7 @@ msgstr "編輯硬體商店"
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18058,19 +19101,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"
@@ -18106,8 +19149,8 @@ msgstr "編輯旅行社"
msgid "Musical Instrument"
msgstr "樂器"
-msgid "Edit Musical Instruments"
-msgstr "編輯樂器"
+msgid "Edit Musical Instruments Shop"
+msgstr ""
msgid "Toys"
msgstr "玩具類"
@@ -18319,6 +19362,12 @@ msgstr "峰"
msgid "Edit Peak"
msgstr "編輯山峰"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "冰河"
@@ -18358,26 +19407,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 "森林"
@@ -18385,15 +19443,6 @@ msgstr "森林"
msgid "Edit Forest Landuse"
msgstr "編輯森林土地利用"
-msgid "coniferous"
-msgstr "松類"
-
-msgid "deciduous"
-msgstr "落葉類"
-
-msgid "mixed"
-msgstr "混合"
-
msgid "Grassland"
msgstr ""
@@ -18469,6 +19518,12 @@ msgstr "青草地"
msgid "Edit Meadow Landuse"
msgstr "編輯青草地土地利用"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18523,8 +19578,8 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
-msgstr "住宅區"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "編輯住宅區土地利用"
@@ -18535,6 +19590,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18610,6 +19668,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 "編輯地址資訊"
@@ -18646,6 +19731,18 @@ msgstr "偶數"
msgid "alphabetic"
msgstr "按字母順序"
+msgid "Accuracy"
+msgstr "準確度"
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr "連絡方式 (一般形式)"
@@ -18814,21 +19911,50 @@ msgstr ""
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 ""
+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 ""
@@ -18874,20 +20000,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 "街"
@@ -18910,7 +20039,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 +20135,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 +20165,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -19036,11 +20177,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 "河岸"
@@ -19057,6 +20198,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19072,28 +20216,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"
@@ -19114,20 +20258,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 "旅館"
@@ -19201,10 +20345,13 @@ msgstr "路線"
msgid "boundary"
msgstr "邊界"
+msgid "sport"
+msgstr "運動"
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19219,9 +20366,6 @@ msgstr "村/市"
msgid "One Way"
msgstr "單行道"
-msgid "Church"
-msgstr "教堂"
-
msgid "Fuel Station"
msgstr "加油站"
@@ -19249,6 +20393,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19294,10 +20441,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"
@@ -19309,7 +20486,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"
@@ -19327,7 +20504,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19444,19 +20621,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 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"
@@ -19475,7 +20763,46 @@ 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 "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 "Landsat"
@@ -19487,19 +20814,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 "skobbler heatmap"
@@ -19520,7 +20856,7 @@ msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "2u"
+msgid "osmfr"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -19529,6 +20865,9 @@ msgstr ""
msgid "Geoimage.at MaxRes"
msgstr ""
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -19675,6 +21014,29 @@ 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 ""
@@ -19840,6 +21202,9 @@ msgstr ""
msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
msgid "OSM - Tiger Edited Map"
msgstr ""
@@ -19885,6 +21250,39 @@ msgstr ""
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 "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 "Columbus V-900 CSV 檔案"
@@ -20086,6 +21484,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 "開啟海拔設定檔視窗。"
@@ -20107,14 +21517,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 ""
@@ -20376,10 +21780,13 @@ msgstr "選擇不完整的地址"
msgid "Selects all addresses with incomplete data."
msgstr "選擇所有資料不完整的地址。"
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
-msgid "Housenumber increment:"
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20495,6 +21902,18 @@ msgstr ""
msgid "OSM Inspector Bugs"
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 ""
@@ -20582,8 +22001,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 個字元"
@@ -20887,15 +22306,6 @@ msgstr "門牌號碼："
msgid "Street Name:"
msgstr "街道名稱："
-msgid "Increment"
-msgstr "遞增"
-
-msgid "Decrement"
-msgstr "遞減"
-
-msgid "Numbers:"
-msgstr "號碼："
-
msgid "Big buildings mode"
msgstr "大型建築模式"
@@ -21078,6 +22488,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 圖層。"
@@ -21096,12 +22509,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr "符號"
@@ -21242,6 +22649,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 ""
@@ -21259,6 +22669,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=...」加入元件？"
@@ -21495,8 +22908,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 "是向量化的。"
@@ -21547,7 +22963,7 @@ msgstr "從清單中刪除選取的配置。"
msgid "Color Schemes"
msgstr "顏色配置"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21776,27 +23192,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 "從裝置匯入資料"
@@ -22881,9 +24279,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 "密西根左轉"
@@ -23532,9 +24947,6 @@ msgstr "<html>選取的資料包含來自 OpenStreetBugs 的資料。<br>您不
msgid "An error occurred: {0}"
msgstr "發生一個錯誤：{0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "無法建立新的錯誤報告。結果：{0}"
-
msgid "Process queue"
msgstr "程序佇列"
@@ -23587,18 +24999,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 ""
@@ -23945,6 +25345,27 @@ msgstr "測試失敗：無法讀取 mtime。"
msgid "Test failed: Could not write mtime."
msgstr "測試失敗：無法寫入 mtime。"
+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 ""
@@ -24096,6 +25517,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 ""
@@ -24413,9 +25837,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr "軌跡"
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24631,6 +26052,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} 的合併目標"
@@ -24663,15 +26087,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 ""
@@ -24786,9 +26226,6 @@ msgstr "路線規畫外掛程式偏好設定"
msgid "Configure routing preferences."
msgstr "設定路線規畫偏好設定"
-msgid "Highway type"
-msgstr "公路類型"
-
msgid "Speed (Km/h)"
msgstr "速限 (Km/h)"
@@ -24967,19 +26404,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"
@@ -25195,6 +26632,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"
@@ -25233,6 +26759,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..."
@@ -25393,9 +26922,6 @@ msgstr "簽署已取消！"
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr "準確度"
-
msgid "Select as much as you like:"
msgstr "選擇您想要的："
@@ -26384,9 +27910,6 @@ msgstr "取消選取節點"
msgid "Removes all nodes from selection"
msgstr "從選擇區域移除所有的節點"
-msgid "Video"
-msgstr "影片類"
-
msgid "Import Video"
msgstr "匯入影片"
@@ -26667,9 +28190,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/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/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/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/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/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/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/josm/Main.java b/src/org/openstreetmap/josm/Main.java
index 4c933f2..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;
@@ -68,6 +71,7 @@ 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;
@@ -101,6 +105,18 @@ import org.openstreetmap.josm.tools.WindowGeometry;
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.
*
@@ -191,65 +207,125 @@ abstract public class Main {
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.err.println(tr("ERROR: {0}", msg));
+ }
+
+ /**
+ * Prints a warning message if logging is on.
+ * @param msg The message to print.
+ */
+ public static void warn(String msg) {
+ if (logLevel < 2)
return;
System.err.println(tr("WARNING: {0}", msg));
}
+
/**
- * Print an informational message if logging is on.
+ * Prints an informational message if logging is on.
* @param msg The message to print.
*/
- static public void info(String msg) {
- if (log_level < 2)
+ public static void info(String msg) {
+ if (logLevel < 3)
return;
- System.err.println(tr("INFO: {0}", msg));
+ System.out.println(tr("INFO: {0}", msg));
}
+
/**
- * Print an debug message if logging is on.
+ * Prints a debug message if logging is on.
* @param msg The message to print.
*/
- static public void debug(String msg) {
- if (log_level < 3)
+ public static void debug(String msg) {
+ if (logLevel < 4)
return;
- System.err.println(tr("DEBUG: {0}", msg));
+ 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
+ */
+ public static void error(String msg, Object... objects) {
+ error(MessageFormat.format(msg, objects));
+ }
+
/**
- * Print a formated warning message if logging is on. Calls {@link MessageFormat#format}
+ * 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.
*/
- static public void warn(String msg, Object... objects) {
+ 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
@@ -264,6 +340,23 @@ 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.
*/
@@ -298,7 +391,7 @@ abstract public class Main {
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);
}
}
@@ -479,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();
}
@@ -500,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();
}
@@ -523,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);
@@ -592,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();
@@ -616,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);
@@ -698,7 +788,7 @@ 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);
}
@@ -742,11 +832,12 @@ abstract public class Main {
/**
* 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 return code of 0.
+ * @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) {
+ public static boolean exitJosm(boolean exit, int exitCode) {
if (Main.saveUnsavedModifications()) {
geometry.remember("gui.geometry");
if (map != null) {
@@ -761,7 +852,7 @@ abstract public class Main {
}
}
if (exit) {
- System.exit(0);
+ System.exit(exitCode);
}
return true;
}
@@ -845,7 +936,7 @@ abstract public class Main {
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();
@@ -856,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();
}
}
@@ -912,7 +1003,8 @@ abstract public class Main {
if (version != null) {
if (version.startsWith("1.6") || version.startsWith("6") ||
version.startsWith("1.7") || version.startsWith("7") ||
- version.startsWith("1.8") || version.startsWith("8"))
+ 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>"+
@@ -921,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());
@@ -940,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);
}
/* ----------------------------------------------------------------------------------------- */
@@ -983,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
@@ -1063,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.
diff --git a/src/org/openstreetmap/josm/actions/AboutAction.java b/src/org/openstreetmap/josm/actions/AboutAction.java
index e28008b..08dc17b 100644
--- a/src/org/openstreetmap/josm/actions/AboutAction.java
+++ b/src/org/openstreetmap/josm/actions/AboutAction.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;
@@ -19,12 +19,12 @@ 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;
/**
@@ -84,7 +84,7 @@ 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(BugReportExceptionHandler.getBugReportUrlLabel(Utils.strip(ShowStatusReportAction.getReportHeader())), GBC.eol().fill(GBC.HORIZONTAL));
diff --git a/src/org/openstreetmap/josm/actions/AbstractInfoAction.java b/src/org/openstreetmap/josm/actions/AbstractInfoAction.java
index ca39d60..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
//
diff --git a/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java b/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
index bae0fa1..1b79ebb 100644
--- a/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
+++ b/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
@@ -8,20 +8,22 @@ 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;
@@ -77,7 +79,6 @@ 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());
@@ -107,8 +108,7 @@ 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;
}
diff --git a/src/org/openstreetmap/josm/actions/AddNodeAction.java b/src/org/openstreetmap/josm/actions/AddNodeAction.java
index 0b4ff5b..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;
diff --git a/src/org/openstreetmap/josm/actions/AlignInCircleAction.java b/src/org/openstreetmap/josm/actions/AlignInCircleAction.java
index 69967b5..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")),
@@ -137,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;
}
@@ -150,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());
diff --git a/src/org/openstreetmap/josm/actions/AlignInLineAction.java b/src/org/openstreetmap/josm/actions/AlignInLineAction.java
index 8596342..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) {
@@ -108,7 +109,7 @@ 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:
@@ -133,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 51a9834..a6887ac 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,7 +7,9 @@ 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;
@@ -37,7 +39,7 @@ 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"),
@@ -45,7 +47,12 @@ public class AutoScaleAction extends JosmAction {
marktr("download"),
marktr("problem"),
marktr("previous"),
- marktr("next")};
+ marktr("next")));
+
+ private final String mode;
+
+ protected ZoomChangeAdapter zoomChangeAdapter;
+ protected MapFrameAdapter mapFrameAdapter;
private final String mode;
@@ -59,8 +66,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(
@@ -186,7 +192,6 @@ 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);
@@ -259,7 +264,7 @@ 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
diff --git a/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java b/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java
index 934aa14..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,15 +50,10 @@ public class ChangesetManagerToggleAction extends JosmAction {
}
}
- @Override
- 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/CombineWayAction.java b/src/org/openstreetmap/josm/actions/CombineWayAction.java
index 57c6e7e..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);
@@ -197,12 +199,11 @@ public class CombineWayAction extends JosmAction {
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
@@ -249,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;
}
@@ -306,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;
}
@@ -318,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)
@@ -343,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) {
@@ -354,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));
}
@@ -362,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);
@@ -396,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 */));
@@ -406,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())) {
@@ -415,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);
}
@@ -427,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);
}
@@ -460,6 +490,9 @@ public class CombineWayAction extends JosmAction {
numUndirectedEges = undirectedEdges.size();
}
+ /**
+ * Constructs a new {@code NodeGraph}.
+ */
public NodeGraph() {
edges = new LinkedHashSet<NodePair>();
}
diff --git a/src/org/openstreetmap/josm/actions/CopyAction.java b/src/org/openstreetmap/josm/actions/CopyAction.java
index 6e03a47..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,6 +13,7 @@ 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;
@@ -22,6 +23,9 @@ import org.openstreetmap.josm.tools.Utils;
* @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}.
@@ -31,6 +35,9 @@ public final class CopyAction extends JosmAction {
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
@@ -42,7 +49,8 @@ public final class CopyAction extends JosmAction {
}
/**
- * Copies the given primitive ids to the clipboard.
+ * 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
*/
@@ -50,6 +58,7 @@ public final class CopyAction extends JosmAction {
/* 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/CreateCircleAction.java b/src/org/openstreetmap/josm/actions/CreateCircleAction.java
index c22082f..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")),
@@ -177,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) {
@@ -201,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;
}
@@ -262,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 20725c5..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")),
@@ -61,8 +66,12 @@ public class CreateMultipolygonAction extends JosmAction {
*/
@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;
}
@@ -71,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;
}
@@ -151,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;
@@ -246,17 +261,18 @@ public class CreateMultipolygonAction extends JosmAction {
List<Command> commands = new ArrayList<Command>();
boolean moveTags = Main.pref.getBoolean("multipoly.movetags", true);
- for( String key : values.keySet() ) {
+ for (Entry<String, String> entry : values.entrySet()) {
List<OsmPrimitive> affectedWays = new ArrayList<OsmPrimitive>();
- String value = values.get(key);
+ String key = entry.getKey();
+ String value = entry.getValue();
- for( Way way : innerWays ) {
- if( way.hasKey(key) && (value.equals(way.get(key))) ) {
+ for (Way way : innerWays) {
+ if (way.hasKey(key) && (value.equals(way.get(key)))) {
affectedWays.add(way);
}
}
- if( moveTags ) {
+ if (moveTags) {
// remove duplicated tags from outer ways
for( Way way : outerWays ) {
if( way.hasKey(key) ) {
@@ -265,27 +281,28 @@ public class CreateMultipolygonAction extends JosmAction {
}
}
- if(!affectedWays.isEmpty()) {
+ if (!affectedWays.isEmpty()) {
// reset key tag on affected ways
commands.add(new ChangePropertyCommand(affectedWays, key, null));
}
}
- if( moveTags ) {
+ 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));
+ 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, values.get(key));
+ r2.put(key, entry.getValue());
fixed = true;
}
}
- if( fixed && !relation.isNew() )
+ if (fixed && !relation.isNew())
commands.add(new ChangeCommand(relation, r2));
}
diff --git a/src/org/openstreetmap/josm/actions/DeleteAction.java b/src/org/openstreetmap/josm/actions/DeleteAction.java
index 7657fb9..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;
diff --git a/src/org/openstreetmap/josm/actions/DialogsToggleAction.java b/src/org/openstreetmap/josm/actions/DialogsToggleAction.java
index bd5ee91..7050ff7 100644
--- a/src/org/openstreetmap/josm/actions/DialogsToggleAction.java
+++ b/src/org/openstreetmap/josm/actions/DialogsToggleAction.java
@@ -6,73 +6,55 @@ 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 javax.swing.Icon;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.tools.Shortcut;
-/*
-* Action that hides or shows toggle dialogs panel and other panels
-* to free more space for drawing (GIMP-like)
+/**
+* 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 JosmAction {
- private final List<ButtonModel> buttonModels = new ArrayList<ButtonModel>();
- private boolean selected;
+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
+ 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"));
- selected = Main.pref.getBoolean("draw.dialogspanel", true);
+ setSelected(Main.pref.getBoolean("draw.dialogspanel", true));
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.dialogspanel", selected);
+ @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(selected) {
+ 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));
@@ -84,9 +66,4 @@ public class DialogsToggleAction extends JosmAction {
Main.map.mapView.rememberLastPositionOnScreen();
}
}
-
- @Override
- public void actionPerformed(ActionEvent e) {
- toggleSelectedState();
- }
}
diff --git a/src/org/openstreetmap/josm/actions/DiskAccessAction.java b/src/org/openstreetmap/josm/actions/DiskAccessAction.java
index 1cf60a6..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;
diff --git a/src/org/openstreetmap/josm/actions/DistributeAction.java b/src/org/openstreetmap/josm/actions/DistributeAction.java
index 62cfd52..5e98f9a 100644
--- a/src/org/openstreetmap/josm/actions/DistributeAction.java
+++ b/src/org/openstreetmap/josm/actions/DistributeAction.java
@@ -1,4 +1,4 @@
-// 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.gui.help.HelpUtil.ht;
@@ -21,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;
/**
@@ -75,12 +76,11 @@ public final class DistributeAction extends JosmAction {
}
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;
}
diff --git a/src/org/openstreetmap/josm/actions/DownloadAction.java b/src/org/openstreetmap/josm/actions/DownloadAction.java
index 8967476..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;
diff --git a/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java b/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java
index 6a06035..5bae4eb 100644
--- a/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java
+++ b/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java
@@ -55,7 +55,7 @@ public class DownloadPrimitiveAction extends JosmAction {
public void actionPerformed(ActionEvent e) {
DownloadObjectDialog dialog = new DownloadObjectDialog();
- if (dialog.showDialog().getValue() != 1) return;
+ if (dialog.showDialog().getValue() != dialog.getContinueButtonIndex()) return;
processItems(dialog.isNewLayerRequested(), dialog.getOsmIds(), dialog.isReferrersRequested(), dialog.isFullRelationRequested());
}
@@ -104,7 +104,9 @@ public class DownloadPrimitiveAction extends JosmAction {
}
});
} catch (InterruptedException ex) {
+ Main.warn("InterruptedException while displaying error dialog");
} catch (InvocationTargetException ex) {
+ Main.warn(ex);
}
}
diff --git a/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java b/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java
index 5be52f6..2f6255a 100644
--- a/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java
+++ b/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java
@@ -80,9 +80,9 @@ public class DownloadReferrersAction extends JosmAction{
@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 7d6c8fc..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;
diff --git a/src/org/openstreetmap/josm/actions/ExitAction.java b/src/org/openstreetmap/josm/actions/ExitAction.java
index 69fec6a..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;
@@ -27,6 +27,6 @@ public class ExitAction extends JosmAction {
@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 a22c459..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,61 +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 bccd93e..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());
+ }
}
}
diff --git a/src/org/openstreetmap/josm/actions/FollowLineAction.java b/src/org/openstreetmap/josm/actions/FollowLineAction.java
index 110470a..bdeccfa 100644
--- a/src/org/openstreetmap/josm/actions/FollowLineAction.java
+++ b/src/org/openstreetmap/josm/actions/FollowLineAction.java
@@ -119,7 +119,7 @@ public class FollowLineAction extends JosmAction {
// 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 1b6f4a5..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,9 +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");
}
-
- @Override
- 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 20b1531..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;
diff --git a/src/org/openstreetmap/josm/actions/HelpAction.java b/src/org/openstreetmap/josm/actions/HelpAction.java
index 6eddf1a..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;
diff --git a/src/org/openstreetmap/josm/actions/HistoryInfoAction.java b/src/org/openstreetmap/josm/actions/HistoryInfoAction.java
index 1f7f401..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 {
+ /**
+ * 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);
+ 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) {
+ if (set != null && !set.getAllSelected().isEmpty()) {
HistoryBrowserDialogManager.getInstance().showHistory(set.getAllSelected());
- }
- }
-
- @Override
- public void updateEnabledState() {
- if (getCurrentDataSet() == null) {
- setEnabled(false);
} else {
- updateEnabledState(getCurrentDataSet().getAllSelected());
+ HistoryObjectIDDialog dialog = new HistoryObjectIDDialog();
+ if (dialog.showDialog().getValue() == dialog.getContinueButtonIndex()) {
+ HistoryBrowserDialogManager.getInstance().showHistory(dialog.getOsmIds());
+ }
}
}
- @Override
- protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
- setEnabled(!selection.isEmpty());
+ /**
+ * 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 c65e22c..497f4a7 100644
--- a/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java
+++ b/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.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;
diff --git a/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java b/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
index 9517233..a974790 100644
--- a/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
+++ b/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
@@ -25,10 +25,10 @@ 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{
diff --git a/src/org/openstreetmap/josm/actions/InfoAction.java b/src/org/openstreetmap/josm/actions/InfoAction.java
index 39003a7..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."),
@@ -29,7 +32,7 @@ public class InfoAction extends JosmAction {
public void actionPerformed(ActionEvent ae) {
DataSet set = getCurrentDataSet();
if (set != null) {
- new InspectPrimitiveDialog(set.getAllSelected(), Main.map.mapView.getEditLayer()).showDialog();
+ new InspectPrimitiveDialog(set.getAllSelected(), Main.main.getEditLayer()).showDialog();
}
}
diff --git a/src/org/openstreetmap/josm/actions/InfoWebAction.java b/src/org/openstreetmap/josm/actions/InfoWebAction.java
index 8d5ba1e..d4cbe2a 100644
--- a/src/org/openstreetmap/josm/actions/InfoWebAction.java
+++ b/src/org/openstreetmap/josm/actions/InfoWebAction.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;
diff --git a/src/org/openstreetmap/josm/actions/JoinAreasAction.java b/src/org/openstreetmap/josm/actions/JoinAreasAction.java
index 9db8182..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,6 +41,7 @@ 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;
@@ -61,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;
}
@@ -72,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>();
@@ -319,14 +316,20 @@ public class JoinAreasAction extends JosmAction {
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;
}
@@ -354,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;
}
@@ -376,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) {
@@ -445,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) {
@@ -455,20 +464,20 @@ public class JoinAreasAction extends JosmAction {
// Don't warn now, because it will really look corrupted
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,7 +516,7 @@ public class JoinAreasAction extends JosmAction {
// Delete the discarded inner ways
if (!discardedWays.isEmpty()) {
- Command deleteCmd = DeleteCommand.delete(Main.map.mapView.getEditLayer(), discardedWays, true);
+ 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"));
@@ -517,11 +526,14 @@ public class JoinAreasAction extends JosmAction {
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;
}
@@ -644,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>();
@@ -814,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());
@@ -1211,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;
}
@@ -1221,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;
}
}
@@ -1248,7 +1275,6 @@ public class JoinAreasAction extends JosmAction {
Multipolygon pol = new Multipolygon(outerWay);
pol.innerWays.addAll(innerWays);
- pol.relation = r;
result.add(pol);
}
@@ -1266,29 +1292,6 @@ public class JoinAreasAction extends JosmAction {
}
/**
- * This method filters the list of relations that form the multipolygons.
- * @param relations all relations
- * @param polygons polygons for filtering
- * @return relations which don't form the polygons
- */
- 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 inner List of already closed inner ways
* @param outer The outer way
@@ -1314,8 +1317,8 @@ public class JoinAreasAction extends JosmAction {
* @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()) {
@@ -1353,10 +1356,10 @@ public class JoinAreasAction extends JosmAction {
* @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);
}
@@ -1419,8 +1422,6 @@ public class JoinAreasAction extends JosmAction {
* @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);
diff --git a/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java b/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java
index f0e8b5e..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;
@@ -93,8 +93,6 @@ public class JoinNodeWayAction extends JosmAction {
}
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 d8c4598..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;
diff --git a/src/org/openstreetmap/josm/actions/JumpToAction.java b/src/org/openstreetmap/josm/actions/JumpToAction.java
index c7a6c1d..9d4d5ba 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,8 +7,8 @@ import java.awt.BorderLayout;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
-import javax.swing.Icon;
+import javax.swing.Icon;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
@@ -18,40 +18,51 @@ 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;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
+/**
+ * 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"), (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", false);
+ 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 JosmTextField url = new JosmTextField();
- private JosmTextField lat = new JosmTextField();
- private JosmTextField lon = new JosmTextField();
- private JosmTextField zm = new JosmTextField();
+ 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());
@@ -63,23 +74,23 @@ public class JumpToAction extends JosmAction {
+ "</html>"),
BorderLayout.NORTH);
- class osmURLListener implements DocumentListener {
+ 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 {
+ 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);
@@ -123,20 +134,26 @@ public class JumpToAction extends JosmAction {
}
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)
@@ -157,17 +174,31 @@ public class JumpToAction extends JosmAction {
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();
}
+
+ @Override
+ protected void updateEnabledState() {
+ setEnabled(Main.isDisplayingMapView());
+ }
+
+ @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 97%
rename from src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java
rename to src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java
index 9d460cc..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;
@@ -23,11 +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
*/
@@ -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"),
diff --git a/src/org/openstreetmap/josm/actions/MergeNodesAction.java b/src/org/openstreetmap/josm/actions/MergeNodesAction.java
index 6ebc21b..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,9 +48,14 @@ 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);
@@ -67,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);
@@ -195,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);
@@ -248,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) {
@@ -263,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;
@@ -280,6 +305,7 @@ 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.
+ * @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) {
@@ -289,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));
@@ -315,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/MirrorAction.java b/src/org/openstreetmap/josm/actions/MirrorAction.java
index 45dc847..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;
/**
@@ -51,12 +52,11 @@ public final class MirrorAction extends JosmAction {
}
if (nodes.isEmpty()) {
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("Please select at least one node or way."),
- tr("Information"),
- JOptionPane.INFORMATION_MESSAGE
- );
+ 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 1fb0699..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;
diff --git a/src/org/openstreetmap/josm/actions/MoveNodeAction.java b/src/org/openstreetmap/josm/actions/MoveNodeAction.java
index 04055a0..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;
diff --git a/src/org/openstreetmap/josm/actions/NewAction.java b/src/org/openstreetmap/josm/actions/NewAction.java
index 53666e8..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;
diff --git a/src/org/openstreetmap/josm/actions/OpenFileAction.java b/src/org/openstreetmap/josm/actions/OpenFileAction.java
index 2fd176f..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;
@@ -302,7 +302,7 @@ public class OpenFileAction extends DiskAccessAction {
}
Utils.close(reader);
} catch (Exception e) {
- System.err.println(e.getMessage());
+ Main.error(e);
}
}
diff --git a/src/org/openstreetmap/josm/actions/OpenLocationAction.java b/src/org/openstreetmap/josm/actions/OpenLocationAction.java
index 0f2c4d0..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;
@@ -27,6 +27,7 @@ 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;
@@ -61,6 +62,7 @@ public class OpenLocationAction extends JosmAction {
addDownloadTaskClass(DownloadOsmUrlTask.class);
addDownloadTaskClass(DownloadOsmCompressedTask.class);
addDownloadTaskClass(DownloadOsmChangeCompressedTask.class);
+ addDownloadTaskClass(DownloadSessionTask.class);
}
/**
@@ -153,19 +155,19 @@ public class OpenLocationAction extends JosmAction {
* @since 6031
*/
public String findSummaryDocumentation() {
- String result = "<table>";
+ StringBuilder result = new StringBuilder("<table>");
for (Class<? extends DownloadTask> taskClass : downloadTasks) {
if (taskClass != null) {
try {
DownloadTask task = taskClass.getConstructor().newInstance();
- result += task.acceptsDocumentationSummary();
+ result.append(task.acceptsDocumentationSummary());
} catch (Exception e) {
e.printStackTrace();
}
}
}
- result += "</table>";
- return result;
+ result.append("</table>");
+ return result.toString();
}
/**
@@ -180,7 +182,11 @@ 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));
diff --git a/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java b/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
index 9125496..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.
@@ -113,12 +115,11 @@ public final class OrthogonalizeAction extends JosmAction {
} 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();
}
}
}
@@ -143,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 {
@@ -169,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
@@ -183,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();
@@ -250,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 {
@@ -386,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);
@@ -451,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/PasteAction.java b/src/org/openstreetmap/josm/actions/PasteAction.java
index 2091168..ee9ec8d 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;
@@ -43,6 +43,9 @@ public final class PasteAction extends JosmAction implements PasteBufferChangedL
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);
}
@@ -87,7 +90,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() & Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()) != 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);
@@ -110,7 +116,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) {
@@ -128,7 +134,7 @@ public final class PasteAction extends JosmAction implements PasteBufferChangedL
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) {
diff --git a/src/org/openstreetmap/josm/actions/PasteTagsAction.java b/src/org/openstreetmap/josm/actions/PasteTagsAction.java
index b4e12e2..bc6fae1 100644
--- a/src/org/openstreetmap/josm/actions/PasteTagsAction.java
+++ b/src/org/openstreetmap/josm/actions/PasteTagsAction.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;
@@ -12,6 +12,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.command.ChangePropertyCommand;
@@ -39,6 +40,9 @@ 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."),
@@ -249,7 +253,7 @@ public final class PasteTagsAction extends JosmAction {
return;
String buf = Utils.getClipboardContent();
- if (buf == null || buf.isEmpty() || buf.matches("(\\d+,)*\\d+")) {
+ if (buf == null || buf.isEmpty() || buf.matches(CopyAction.CLIPBOARD_REGEXP)) {
pasteTagsFromJOSMBuffer(selection);
} else {
// Paste tags from arbitrary text
@@ -269,10 +273,9 @@ public final class PasteTagsAction extends JosmAction {
if (!TextTagParser.validateTags(tags)) return false;
List<Command> commands = new ArrayList<Command>(tags.size());
- String v;
- for (String key: tags.keySet()) {
- v = tags.get(key);
- commands.add(new ChangePropertyCommand(selection, key, "".equals(v)?null:v));
+ 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();
diff --git a/src/org/openstreetmap/josm/actions/PreferencesAction.java b/src/org/openstreetmap/josm/actions/PreferencesAction.java
index 6c3bc7f..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,6 +49,8 @@ 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;
}
/**
@@ -37,6 +63,12 @@ public class PreferencesAction extends JosmAction implements Runnable {
@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 31d1f62..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>();
@@ -208,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();
diff --git a/src/org/openstreetmap/josm/actions/RedoAction.java b/src/org/openstreetmap/josm/actions/RedoAction.java
index 2ee5095..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;
diff --git a/src/org/openstreetmap/josm/actions/RenameLayerAction.java b/src/org/openstreetmap/josm/actions/RenameLayerAction.java
index 8d760dd..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;
diff --git a/src/org/openstreetmap/josm/actions/RestartAction.java b/src/org/openstreetmap/josm/actions/RestartAction.java
index 6ae1959..5b5a9c2 100644
--- a/src/org/openstreetmap/josm/actions/RestartAction.java
+++ b/src/org/openstreetmap/josm/actions/RestartAction.java
@@ -42,6 +42,14 @@ public class RestartAction extends JosmAction {
@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) {
@@ -63,7 +71,7 @@ public class RestartAction extends JosmAction {
* @throws IOException
*/
public static void restartJOSM() throws IOException {
- if (isRestartSupported() && !Main.exitJosm(false)) return;
+ if (isRestartSupported() && !Main.exitJosm(false, 0)) return;
try {
// java binary
final String java = System.getProperty("java.home") + File.separator + "bin" + File.separator +
@@ -82,11 +90,16 @@ public class RestartAction extends JosmAction {
}
// 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 (mainCommand[0].endsWith(".jar")) {
+ if (jarPath.endsWith(".jar")) {
// if it's a jar, add -jar mainJar
cmd.add("-jar");
- cmd.add(new File(mainCommand[0]).getPath());
+ cmd.add(new File(jarPath).getPath());
} else {
// else it's a .class, add the classpath and mainClass
cmd.add("-cp");
diff --git a/src/org/openstreetmap/josm/actions/ReverseWayAction.java b/src/org/openstreetmap/josm/actions/ReverseWayAction.java
index 47937ef..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;
@@ -79,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 222b4a1..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,7 +18,7 @@ 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();
/**
diff --git a/src/org/openstreetmap/josm/actions/SaveActionBase.java b/src/org/openstreetmap/josm/actions/SaveActionBase.java
index beecb11..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;
diff --git a/src/org/openstreetmap/josm/actions/SaveAsAction.java b/src/org/openstreetmap/josm/actions/SaveAsAction.java
index 400f287..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;
diff --git a/src/org/openstreetmap/josm/actions/SelectAllAction.java b/src/org/openstreetmap/josm/actions/SelectAllAction.java
index f0997f0..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;
diff --git a/src/org/openstreetmap/josm/actions/SessionLoadAction.java b/src/org/openstreetmap/josm/actions/SessionLoadAction.java
index 1474862..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;
@@ -22,10 +25,20 @@ 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"));
@@ -33,31 +46,63 @@ public class SessionLoadAction extends DiskAccessAction {
@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;
}
@@ -78,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);
}
@@ -98,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
@@ -116,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 57cdff2..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()) {
@@ -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/SimplifyWayAction.java b/src/org/openstreetmap/josm/actions/SimplifyWayAction.java
index e976a81..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) {
@@ -103,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;
}
@@ -145,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 = Main.pref.getDouble("simplify-way.max-error", 3.0);
+ 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++;
@@ -185,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);
}
@@ -221,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 53457cc..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;
@@ -127,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;
}
@@ -156,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;
}
@@ -289,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);
@@ -304,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;
}
@@ -494,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 5fdbd4f..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;
diff --git a/src/org/openstreetmap/josm/actions/UnGlueAction.java b/src/org/openstreetmap/josm/actions/UnGlueAction.java
index 41dc2cf..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>();
@@ -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 daa6a10..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;
diff --git a/src/org/openstreetmap/josm/actions/UnselectAllAction.java b/src/org/openstreetmap/josm/actions/UnselectAllAction.java
index df4c61c..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;
diff --git a/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java b/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java
index 4216443..c7327ef 100644
--- a/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java
+++ b/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java
@@ -39,7 +39,7 @@ public class UpdateSelectionAction extends JosmAction {
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);
}
diff --git a/src/org/openstreetmap/josm/actions/UploadAction.java b/src/org/openstreetmap/josm/actions/UploadAction.java
index 2566e35..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.
@@ -267,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 d0630c2..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;
diff --git a/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java b/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java
index 5578cc1..b1ae65b 100644
--- a/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java
+++ b/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java
@@ -6,64 +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 4d7a0b3..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,72 +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");
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);
- }
- }
-
- public void removeButtonModel(ButtonModel model) {
- if (model != null && buttonModels.contains(model)) {
- buttonModels.remove(model);
- }
+ @Override
+ protected void updateEnabledState() {
+ setEnabled(Main.main.hasEditLayer());
}
- protected void notifySelectedState() {
- for (ButtonModel model: buttonModels) {
- if (model.isSelected() != selected) {
- model.setSelected(selected);
- }
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ toggleSelectedState(e);
+ if (isSelected()) {
+ MapRendererFactory.getInstance().activate(WireframeMapRenderer.class);
+ } else {
+ MapRendererFactory.getInstance().activate(StyledMapRenderer.class);
}
- }
-
- 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();
}
}
-
- @Override
- 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 802ef12..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;
@@ -10,17 +10,29 @@ import java.awt.event.KeyEvent;
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)")),
diff --git a/src/org/openstreetmap/josm/actions/ZoomOutAction.java b/src/org/openstreetmap/josm/actions/ZoomOutAction.java
index ddded1a..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;
@@ -10,8 +10,15 @@ import java.awt.event.KeyEvent;
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);
diff --git a/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java b/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java
index 4aa473b..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;
diff --git a/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java b/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java
index 1f248ed..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;
diff --git a/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java b/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java
index ec6d755..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;
diff --git a/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java b/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java
index 36eceef..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;
diff --git a/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java b/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java
index 850188d..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;
diff --git a/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java b/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java
index d196904..1b9e7ac 100644
--- a/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java
+++ b/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java
@@ -1,8 +1,9 @@
-// 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;
diff --git a/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java b/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java
index b154362..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;
diff --git a/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java b/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java
index 10be681..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;
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
index 4c021f3..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=.*,.*,.*,.*";
@@ -57,7 +58,7 @@ public class DownloadGpsTask extends AbstractDownloadTask {
@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);
@@ -65,9 +66,10 @@ public class DownloadGpsTask extends AbstractDownloadTask {
@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;
@@ -75,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 )
@@ -96,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;
@@ -151,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)
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeCompressedTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeCompressedTask.java
index 8cd3b9f..b488c3c 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeCompressedTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeCompressedTask.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 java.util.concurrent.Future;
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java
index ee1140d..765a6fd 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java
@@ -1,6 +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;
@@ -183,7 +185,7 @@ 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());
@@ -195,7 +197,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 b230f8a..66a0f77 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.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 java.util.concurrent.Future;
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
index 4522a4c..3a58436 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.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;
@@ -38,7 +38,7 @@ 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;
@@ -205,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) {
@@ -222,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() {
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmUrlTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmUrlTask.java
index a56d792..ba34605 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmUrlTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmUrlTask.java
@@ -21,7 +21,9 @@ public class DownloadOsmUrlTask extends DownloadOsmTask {
@Override
public String[] getPatterns() {
- return new String[]{"http://www\\.openstreetmap\\.org/\\?lat=.*&lon=.*"};
+ return new String[]{
+ "http://www\\.(osm|openstreetmap)\\.org/\\?lat=.*&lon=.*",
+ "http://www\\.(osm|openstreetmap)\\.org/#map=\\p{Digit}+/.*/.*"};
}
@Override
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/DownloadTaskList.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java
index 330afc8..a6e5f12 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java
@@ -140,7 +140,7 @@ public class DownloadTaskList {
* @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);
@@ -290,7 +290,7 @@ public class DownloadTaskList {
return;
}
}
- final OsmDataLayer editLayer = Main.map.mapView.getEditLayer();
+ final OsmDataLayer editLayer = Main.main.getEditLayer();
if (editLayer != null && osmData) {
final Set<OsmPrimitive> myPrimitives = getCompletePrimitives(editLayer.data);
for (DownloadTask task : tasks) {
diff --git a/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java b/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
index e89fad1..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;
@@ -115,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);
}
}
@@ -126,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();
}
diff --git a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
index a7d1c00..4329a71 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
@@ -178,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
@@ -242,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);
@@ -281,7 +282,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
*/
@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;
@@ -299,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) {
@@ -422,7 +423,7 @@ 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;
@@ -650,7 +651,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
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;
@@ -1169,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
@@ -1192,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()));
}
}
@@ -1209,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."));
}
}
@@ -1224,9 +1225,9 @@ 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."));
}
}
@@ -1237,12 +1238,12 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
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();
}
/**
@@ -1364,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++;
}
@@ -1612,8 +1613,6 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
if (hdg>360) {
hdg-=360;
}
- //fixed=true;
- //absoluteFix=true;
customBaseHeading=hdg;
}
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java b/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
index 726dcdb..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;
@@ -73,6 +73,9 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
private Color mainColor;
private Stroke mainStroke;
+ /** settings value whether shared nodes should be ignored or not */
+ private boolean ignoreSharedNodes;
+
/**
* drawing settings for helper lines
*/
@@ -152,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;
@@ -202,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);
@@ -213,6 +217,8 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
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() {
@@ -222,6 +228,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
try {
Toolkit.getDefaultToolkit().removeAWTEventListener(altKeyListener);
} catch (SecurityException ex) {
+ Main.warn(ex);
}
super.exitMode();
}
@@ -442,12 +449,22 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
//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));
@@ -460,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));
@@ -683,7 +709,7 @@ 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);
@@ -752,16 +778,16 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
}
}
- 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.
@@ -770,7 +796,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
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();
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
index db98b4f..2c010c1 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
@@ -19,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;
@@ -149,6 +148,7 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
Toolkit.getDefaultToolkit().addAWTEventListener(this,
AWTEvent.KEY_EVENT_MASK);
} catch (SecurityException ex) {
+ Main.warn(ex);
}
}
@@ -164,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();
@@ -206,7 +207,6 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
@Override
protected void updateEnabledState() {
setEnabled(getEditLayer() != null);
- // setEnabled(Main.main.getActiveLayer() instanceof OsmDataLayer);
}
// -------------------------------------------------------------------------
@@ -321,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);
@@ -435,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));
@@ -444,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);
@@ -462,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);
@@ -611,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 ed54f88..8c6bd09 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyHelper.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyHelper.java
@@ -21,8 +21,12 @@ 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.
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java b/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
index 4e7c1ad..0780ea3 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
@@ -2,6 +2,7 @@
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;
@@ -17,6 +18,7 @@ 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;
@@ -121,7 +123,7 @@ public class ParallelWayAction extends MapMode implements AWTEventListener, MapV
private WaySegment referenceSegment;
private ParallelWays pWays;
- private LinkedHashSet<Way> sourceWays;
+ private Set<Way> sourceWays;
private EastNorth helperLineStart;
private EastNorth helperLineEnd;
@@ -162,6 +164,7 @@ public class ParallelWayAction extends MapMode implements AWTEventListener, MapV
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) {
@@ -181,6 +184,7 @@ public class ParallelWayAction extends MapMode implements AWTEventListener, MapV
try {
Toolkit.getDefaultToolkit().removeAWTEventListener(this);
} catch (SecurityException ex) {
+ Main.warn(ex);
}
removeWayHighlighting(sourceWays);
pWays = null;
@@ -285,11 +289,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 =
@@ -309,7 +308,7 @@ public class ParallelWayAction extends MapMode implements AWTEventListener, MapV
if (e.getButton() != MouseEvent.BUTTON1)
return;
- if(sanityCheck() == false)
+ if (!sanityCheck())
return;
updateFlagsOnlyChangeableOnPress();
@@ -522,8 +521,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);
@@ -585,8 +582,17 @@ 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);
}
@Override
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java b/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java
index 88da9e2..389fed8 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java
@@ -177,7 +177,7 @@ public class ParallelWays {
}
private List<Command> makeAddWayAndNodesCommandList() {
- ArrayList<Command> commands = new ArrayList<Command>(sortedNodes.size() + ways.size());
+ 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)));
}
diff --git a/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java b/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java
index 58b1998..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;
@@ -54,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();
diff --git a/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java b/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
index 0779890..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,7 +204,9 @@ 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();
}
@@ -310,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;
}
@@ -361,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;
@@ -697,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();
@@ -816,7 +822,7 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
}
/**
- * 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.
*/
@@ -941,9 +947,6 @@ 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
cycleList = MapView.asColl(osm);
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java b/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java
index 349eb72..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;
diff --git a/src/org/openstreetmap/josm/actions/relation/DeleteRelationsAction.java b/src/org/openstreetmap/josm/actions/relation/DeleteRelationsAction.java
index 1040c1f..c54b278 100644
--- a/src/org/openstreetmap/josm/actions/relation/DeleteRelationsAction.java
+++ b/src/org/openstreetmap/josm/actions/relation/DeleteRelationsAction.java
@@ -38,7 +38,7 @@ public class DeleteRelationsAction extends AbstractRelationAction {
@Override
public void actionPerformed(ActionEvent e) {
- if (!isEnabled() || Main.main.getEditLayer() == null)
+ 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
index cffdf7a..2af6e66 100644
--- a/src/org/openstreetmap/josm/actions/relation/DownloadMembersAction.java
+++ b/src/org/openstreetmap/josm/actions/relation/DownloadMembersAction.java
@@ -33,8 +33,8 @@ public class DownloadMembersAction extends AbstractRelationAction {
@Override
public void actionPerformed(ActionEvent e) {
- if (!isEnabled() || relations.isEmpty() || Main.map==null || Main.map.mapView==null) return;
- Main.worker.submit(new DownloadRelationTask(relations, Main.map.mapView.getEditLayer()));
+ if (!isEnabled() || relations.isEmpty() || !Main.isDisplayingMapView()) return;
+ Main.worker.submit(new DownloadRelationTask(relations, Main.main.getEditLayer()));
}
@Override
diff --git a/src/org/openstreetmap/josm/actions/relation/DownloadSelectedIncompleteMembersAction.java b/src/org/openstreetmap/josm/actions/relation/DownloadSelectedIncompleteMembersAction.java
index b3f9b99..e4d7011 100644
--- a/src/org/openstreetmap/josm/actions/relation/DownloadSelectedIncompleteMembersAction.java
+++ b/src/org/openstreetmap/josm/actions/relation/DownloadSelectedIncompleteMembersAction.java
@@ -46,11 +46,11 @@ public class DownloadSelectedIncompleteMembersAction extends AbstractRelationAct
@Override
public void actionPerformed(ActionEvent e) {
- if (!isEnabled() || relations.isEmpty() || Main.map==null || Main.map.mapView==null) return;
+ if (!isEnabled() || relations.isEmpty() || !Main.isDisplayingMapView()) return;
Main.worker.submit(new DownloadRelationMemberTask(
relations,
buildSetOfIncompleteMembers(relations),
- Main.map.mapView.getEditLayer()));
+ Main.main.getEditLayer()));
}
@Override
diff --git a/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java b/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java
index e7cf746..5e1f00c 100644
--- a/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java
+++ b/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java
@@ -38,8 +38,8 @@ public class EditRelationAction extends AbstractRelationAction {
*/
public static Set<RelationMember> getMembersForCurrentSelection(Relation r) {
Set<RelationMember> members = new HashSet<RelationMember>();
- if (Main.map != null && Main.map.mapView != null) {
- OsmDataLayer editLayer = Main.map.mapView.getEditLayer();
+ 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()) {
@@ -57,8 +57,8 @@ public class EditRelationAction extends AbstractRelationAction {
* @param toEdit The relation to edit
*/
public static void launchEditor(Relation toEdit) {
- if (toEdit == null || Main.map==null || Main.map.mapView==null) return;
- RelationEditor.getEditor(Main.map.mapView.getEditLayer(), toEdit,
+ if (toEdit == null || !Main.isDisplayingMapView()) return;
+ RelationEditor.getEditor(Main.main.getEditLayer(), toEdit,
getMembersForCurrentSelection(toEdit)).setVisible(true);
}
diff --git a/src/org/openstreetmap/josm/actions/relation/SelectMembersAction.java b/src/org/openstreetmap/josm/actions/relation/SelectMembersAction.java
index 0b32d0a..d11d91b 100644
--- a/src/org/openstreetmap/josm/actions/relation/SelectMembersAction.java
+++ b/src/org/openstreetmap/josm/actions/relation/SelectMembersAction.java
@@ -33,16 +33,16 @@ public class SelectMembersAction extends AbstractRelationAction {
@Override
public void actionPerformed(ActionEvent e) {
- if (!isEnabled() || relations.isEmpty() || Main.map==null || Main.map.mapView==null) return;
+ if (!isEnabled() || relations.isEmpty() || !Main.isDisplayingMapView()) return;
HashSet<OsmPrimitive> members = new HashSet<OsmPrimitive>();
for (Relation r: relations) {
members.addAll(r.getMemberPrimitives());
}
if (add) {
- Main.map.mapView.getEditLayer().data.addSelected(members);
+ Main.main.getEditLayer().data.addSelected(members);
} else {
- Main.map.mapView.getEditLayer().data.setSelected(members);
+ 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
index 25a326d..9134dd7 100644
--- a/src/org/openstreetmap/josm/actions/relation/SelectRelationAction.java
+++ b/src/org/openstreetmap/josm/actions/relation/SelectRelationAction.java
@@ -30,8 +30,8 @@ public class SelectRelationAction extends AbstractRelationAction {
@Override
public void actionPerformed(ActionEvent e) {
- if (!isEnabled() || relations.isEmpty() || Main.map==null || Main.map.mapView==null) return;
- OsmDataLayer editLayer = Main.map.mapView.getEditLayer();
+ if (!isEnabled() || relations.isEmpty()) return;
+ OsmDataLayer editLayer = Main.main.getEditLayer();
if (editLayer==null || editLayer.data==null) return;
if (add) {
editLayer.data.addSelected(relations);
diff --git a/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java b/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java
index 438fd05..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;
@@ -58,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;
@@ -81,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;
@@ -133,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 a6154ef..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;
@@ -110,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);
}
@@ -119,6 +119,9 @@ 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);
@@ -391,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"))
@@ -682,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++;
diff --git a/src/org/openstreetmap/josm/actions/search/SearchCompiler.java b/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
index 7944f36..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;
@@ -27,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.
@@ -206,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);
@@ -231,6 +232,11 @@ public class SearchCompiler {
}
return true;
}
+
+ @Override
+ public final boolean evaluate(OsmPrimitive object) {
+ return match(object);
+ }
}
/**
@@ -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.
*/
@@ -754,7 +786,7 @@ public class SearchCompiler {
}
@Override public String toString() {
- return "user=" + user == null ? "" : user;
+ return "user=" + (user == null ? "" : user);
}
}
@@ -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))))
@@ -1231,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 5797d35..57fc753 100644
--- a/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java
+++ b/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java
@@ -52,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/RelationUploadOrderHook.java b/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java
index 33c6ed0..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
*
@@ -98,9 +93,8 @@ public class RelationUploadOrderHook implements UploadHook {
@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 fc1af00..98fde1c 100644
--- a/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java
+++ b/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java
@@ -22,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;
@@ -33,12 +34,10 @@ 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
*/
@@ -61,11 +60,9 @@ public class ValidateUploadHook implements UploadHook
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 {
+ 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/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 8058047..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
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 9d7b15e..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,7 @@ 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;
@@ -54,6 +55,26 @@ abstract public class Command extends PseudoCommand {
}
}
+ /**
+ * 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>();
@@ -64,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();
}
/**
@@ -221,8 +242,7 @@ abstract public class Command extends PseudoCommand {
private static boolean isOutlying(OsmPrimitive osm, Area area) {
if (osm instanceof Node && !osm.isNewOrUndeleted()) {
- LatLon coor = ((Node) osm).getCoor();
- return coor != null && !area.contains(coor);
+ 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 6e3ebe0..fd95ee6 100644
--- a/src/org/openstreetmap/josm/command/ConflictResolveCommand.java
+++ b/src/org/openstreetmap/josm/command/ConflictResolveCommand.java
@@ -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/DeleteCommand.java b/src/org/openstreetmap/josm/command/DeleteCommand.java
index d0a3271..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;
diff --git a/src/org/openstreetmap/josm/command/MoveCommand.java b/src/org/openstreetmap/josm/command/MoveCommand.java
index 094a98b..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;
@@ -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);
@@ -84,23 +75,19 @@ 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
@@ -134,13 +121,13 @@ public class MoveCommand extends Command {
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/RelationMemberConflictResolverCommand.java b/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java
index 7eca041..368c354 100644
--- a/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java
+++ b/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java
@@ -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/ChangeNodesCommand.java b/src/org/openstreetmap/josm/command/RemoveNodesCommand.java
similarity index 65%
copy from src/org/openstreetmap/josm/command/ChangeNodesCommand.java
copy to src/org/openstreetmap/josm/command/RemoveNodesCommand.java
index 46a7ec2..b00f233 100644
--- a/src/org/openstreetmap/josm/command/ChangeNodesCommand.java
+++ b/src/org/openstreetmap/josm/command/RemoveNodesCommand.java
@@ -4,7 +4,10 @@ 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;
@@ -15,27 +18,26 @@ import org.openstreetmap.josm.gui.DefaultNameFormatter;
import org.openstreetmap.josm.tools.ImageProvider;
/**
- * Command that changes the nodes list of a way.
- * The same can be done with ChangeCommand, but this is more
- * efficient. (Needed for the duplicate node fixing
- * tool of the validator plugin, when processing large data sets.)
+ * 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 Imi
+ * @author Giuseppe Bilotta
*/
-public class ChangeNodesCommand extends Command {
+public class RemoveNodesCommand extends Command {
private final Way way;
- private final List<Node> newNodes;
+ private final Set<Node> rmNodes;
- public ChangeNodesCommand(Way way, List<Node> newNodes) {
+ public RemoveNodesCommand(Way way, List<Node> rmNodes) {
super();
this.way = way;
- this.newNodes = newNodes;
+ this.rmNodes = new HashSet<Node>(rmNodes);
}
@Override public boolean executeCommand() {
super.executeCommand();
- way.setNodes(newNodes);
+ way.removeNodes(rmNodes);
way.setModified(true);
return true;
}
@@ -46,7 +48,7 @@ public class ChangeNodesCommand extends Command {
@Override
public String getDescriptionText() {
- return tr("Changed nodes of {0}", way.getDisplayName(DefaultNameFormatter.getInstance()));
+ return tr("Removed nodes from {0}", way.getDisplayName(DefaultNameFormatter.getInstance()));
}
@Override
diff --git a/src/org/openstreetmap/josm/command/RotateCommand.java b/src/org/openstreetmap/josm/command/RotateCommand.java
index ad09385..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,13 +42,6 @@ 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;
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 9176e17..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,7 +6,6 @@ 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;
@@ -17,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));
@@ -48,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();
@@ -76,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) {
@@ -96,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
@@ -109,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/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/WayNodesConflictResolverCommand.java b/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java
index 48ae8ac..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;
@@ -53,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 be7df58..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;
@@ -33,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();
@@ -57,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/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 de14a4d..a31e397 100644
--- a/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
+++ b/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
@@ -195,7 +195,7 @@ 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 value = way.get(key);
Tag newTag = TagSwitcher.apply(key, value);
@@ -220,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) {
@@ -258,9 +258,7 @@ 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 ignoreKeyForCorrection(String key) {
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 65af687..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,7 +333,7 @@ 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>() {
diff --git a/src/org/openstreetmap/josm/data/AutosaveTask.java b/src/org/openstreetmap/josm/data/AutosaveTask.java
index aad7faf..0bb58ad 100644
--- a/src/org/openstreetmap/josm/data/AutosaveTask.java
+++ b/src/org/openstreetmap/josm/data/AutosaveTask.java
@@ -33,8 +33,10 @@ 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;
@@ -66,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;
@@ -88,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;
}
@@ -158,16 +162,16 @@ public class AutosaveTask extends TimerTask implements LayerChangeListener, List
ps.println(ManagementFactory.getRuntimeMXBean().getName());
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++;
@@ -189,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();
}
@@ -204,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
@@ -256,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();
@@ -299,12 +318,12 @@ public class AutosaveTask extends TimerTask implements LayerChangeListener, List
skipFile = jvmPerfDataFileExists(pid);
}
} catch (Throwable t) {
- System.err.println(t.getClass()+":"+t.getMessage());
+ Main.error(t);
} finally {
Utils.close(reader);
}
} catch (Throwable t) {
- System.err.println(t.getClass()+":"+t.getMessage());
+ Main.error(t);
}
}
if (!skipFile) {
@@ -358,17 +377,17 @@ public class AutosaveTask extends TimerTask implements LayerChangeListener, List
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();
}
@@ -379,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 332b56a..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());
@@ -50,14 +91,34 @@ public class Bounds {
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;
@@ -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)
@@ -323,7 +413,8 @@ public class Bounds {
* @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 01be41d..4185f6e 100644
--- a/src/org/openstreetmap/josm/data/CustomConfigurator.java
+++ b/src/org/openstreetmap/josm/data/CustomConfigurator.java
@@ -21,7 +21,6 @@ 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;
@@ -55,7 +54,12 @@ 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) {
@@ -135,7 +139,7 @@ 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("");
@@ -206,7 +210,7 @@ public class CustomConfigurator {
* @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);
@@ -236,7 +240,7 @@ 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 {
@@ -265,7 +269,7 @@ 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();
}
}
@@ -335,7 +339,9 @@ public class CustomConfigurator {
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
@@ -345,7 +351,6 @@ public class CustomConfigurator {
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);
@@ -355,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);
+ }
});
}
}
@@ -484,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)) {
@@ -684,20 +689,19 @@ public class CustomConfigurator {
}
/**
- * 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();
@@ -750,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);
}
@@ -895,10 +899,11 @@ public class CustomConfigurator {
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());
}
}
}
@@ -906,7 +911,7 @@ 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());
}
}
@@ -949,8 +954,6 @@ public class CustomConfigurator {
? 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);
JOptionPane.showMessageDialog(
@@ -961,10 +964,10 @@ 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 {
@@ -973,8 +976,7 @@ public class CustomConfigurator {
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
@@ -1059,10 +1061,8 @@ 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
@@ -1084,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);
@@ -1153,14 +1153,8 @@ public class CustomConfigurator {
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 bcf7faf..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;
@@ -372,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()),
@@ -465,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());
}
@@ -498,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));
}
}
@@ -555,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;
}
@@ -651,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()),
@@ -662,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()),
@@ -676,11 +666,11 @@ public class Preferences {
File preferenceFile = getPreferenceFile();
try {
if (!preferenceFile.exists()) {
- System.out.println(tr("Info: Missing preference file ''{0}''. Creating a default preference file.", preferenceFile.getAbsoluteFile()));
+ 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();
}
@@ -711,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()));
}
}
}
@@ -737,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);
}
@@ -905,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
@@ -962,7 +954,7 @@ public class Preferences {
}
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
@@ -973,7 +965,7 @@ public class Preferences {
putArrayDefault(key, null);
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
@@ -981,8 +973,6 @@ public class Preferences {
}
public boolean putArray(String key, Collection<Collection<String>> value) {
- boolean changed = false;
-
List<List<String>> oldValue = null;
List<List<String>> valueCopy = null;
@@ -1007,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
@@ -1050,7 +1040,6 @@ public class Preferences {
}
public boolean putListOfStructs(String key, Collection<Map<String, String>> value) {
- boolean changed = false;
List<Map<String, String>> oldValue;
List<Map<String, String>> valueCopy = null;
@@ -1077,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
@@ -1287,7 +1276,7 @@ public class Preferences {
public void visit(MapListSetting setting) {
changed = putListOfStructs(key, setting.getValue());
}
- };
+ }
PutVisitor putVisitor = new PutVisitor();
value.visit(putVisitor);
return putVisitor.changed;
@@ -1369,7 +1358,7 @@ 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
@@ -1611,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()));
@@ -1628,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);
}
@@ -1659,16 +1648,17 @@ public class Preferences {
};
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;
@@ -1677,18 +1667,18 @@ public class Preferences {
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 103ce97..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;
@@ -46,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");
@@ -63,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;
@@ -79,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");
@@ -154,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 a11aaa5..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())
@@ -166,10 +175,19 @@ public class UndoRedoHandler implements MapView.LayerChangeListener {
@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 d5cee36..03ab753 100644
--- a/src/org/openstreetmap/josm/data/Version.java
+++ b/src/org/openstreetmap/josm/data/Version.java
@@ -7,6 +7,7 @@ import java.io.BufferedReader;
import java.io.IOException;
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;
@@ -47,7 +48,7 @@ public class Version {
}
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;
@@ -73,8 +74,8 @@ 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")) {
@@ -105,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();
@@ -113,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;
@@ -130,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;
}
@@ -157,7 +158,7 @@ public class Version {
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;
@@ -234,7 +235,7 @@ public class Version {
s += " SVN";
}
String result = "JOSM/1.5 ("+ s+" "+LanguageInfo.getJOSMLocaleCode()+")";
- if (includeOsDetails) {
+ if (includeOsDetails && Main.platform != null) {
result += " " + Main.platform.getOSDescription();
}
return result;
diff --git a/src/org/openstreetmap/josm/data/conflict/Conflict.java b/src/org/openstreetmap/josm/data/conflict/Conflict.java
index b51f37c..a8518aa 100644
--- a/src/org/openstreetmap/josm/data/conflict/Conflict.java
+++ b/src/org/openstreetmap/josm/data/conflict/Conflict.java
@@ -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 c5bbdc0..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);
}
diff --git a/src/org/openstreetmap/josm/data/coor/CachedLatLon.java b/src/org/openstreetmap/josm/data/coor/CachedLatLon.java
index 47054ca..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;
@@ -32,18 +32,6 @@ 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.
*
diff --git a/src/org/openstreetmap/josm/data/coor/Coordinate.java b/src/org/openstreetmap/josm/data/coor/Coordinate.java
index da6f9e7..18316f9 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.
@@ -41,16 +42,82 @@ abstract class Coordinate extends Point2D implements Serializable {
return y;
}
- @Override
- 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));
@@ -63,9 +130,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 42a8d84..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,7 +83,9 @@ 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;
}
diff --git a/src/org/openstreetmap/josm/data/coor/LatLon.java b/src/org/openstreetmap/josm/data/coor/LatLon.java
index f0670af..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");
@@ -153,14 +167,23 @@ public class LatLon extends Coordinate {
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 8ba8207..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-1.0";
+ 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 0d7e226..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;
@@ -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 a81a511..7fcb82e 100644
--- a/src/org/openstreetmap/josm/data/gpx/IWithAttributes.java
+++ b/src/org/openstreetmap/josm/data/gpx/IWithAttributes.java
@@ -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/WayPoint.java b/src/org/openstreetmap/josm/data/gpx/WayPoint.java
index 9314d23..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
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 361059f..1781dfb 100644
--- a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
+++ b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
@@ -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 f15d8ae..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() {
@@ -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());
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/WmsCache.java b/src/org/openstreetmap/josm/data/imagery/WmsCache.java
index 0682a60..f4198ba 100644
--- a/src/org/openstreetmap/josm/data/imagery/WmsCache.java
+++ b/src/org/openstreetmap/josm/data/imagery/WmsCache.java
@@ -122,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();
}
@@ -150,7 +150,7 @@ 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();
}
}
@@ -186,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()) {
@@ -201,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");
}
}
@@ -296,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();
}
}
@@ -363,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;
}
diff --git a/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java b/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java
index 17f45cc..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;
@@ -30,15 +31,15 @@ public class OAuthParameters {
/**
* 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";
/**
@@ -67,7 +68,7 @@ public class OAuthParameters {
parameters.setRequestTokenUrl(DEFAULT_REQUEST_TOKEN_URL);
parameters.setAccessTokenUrl(DEFAULT_ACCESS_TOKEN_URL);
parameters.setAuthoriseUrl(DEFAULT_AUTHORISE_URL);
- if(!apiUrl.equals(OsmApi.DEFAULT_API_URL)) {
+ if (!OsmApi.DEFAULT_API_URL.equals(apiUrl)) {
try {
String host = new URL(apiUrl).getHost();
if (host.endsWith("dev.openstreetmap.org")) {
diff --git a/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java b/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
index b34591b..d8f8d33 100644
--- a/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
+++ b/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
@@ -199,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);
}
/**
@@ -261,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;
}
@@ -393,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);
}
@@ -710,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 3bc5ee6..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 1d3c83a..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;
diff --git a/src/org/openstreetmap/josm/data/osm/ChangesetCache.java b/src/org/openstreetmap/josm/data/osm/ChangesetCache.java
index dbe1e5b..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();
diff --git a/src/org/openstreetmap/josm/data/osm/DataSet.java b/src/org/openstreetmap/josm/data/osm/DataSet.java
index 3b37cb6..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)
@@ -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() {
@@ -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();
diff --git a/src/org/openstreetmap/josm/data/osm/DataSetMerger.java b/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
index 0465809..f1f4f71 100644
--- a/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
+++ b/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
@@ -79,14 +79,10 @@ public class DataSetMerger {
*/
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());
@@ -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) {
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/Filter.java b/src/org/openstreetmap/josm/data/osm/Filter.java
index 41d04c4..297de34 100644
--- a/src/org/openstreetmap/josm/data/osm/Filter.java
+++ b/src/org/openstreetmap/josm/data/osm/Filter.java
@@ -19,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/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/Node.java b/src/org/openstreetmap/josm/data/osm/Node.java
index 3b3e092..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;
@@ -151,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();
}
}
@@ -330,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/OsmPrimitive.java b/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
index 047d6c4..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;
@@ -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
@@ -648,12 +649,49 @@ 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", "SK53_bulk:load",
- "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;
}
@@ -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;
}
@@ -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 c45146c..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;
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/QuadBuckets.java b/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
index 4835ab2..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,78 +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.
- @SuppressWarnings("unchecked")
- 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
@@ -183,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
@@ -215,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.
@@ -271,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;
@@ -344,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())
@@ -375,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());
}
}
@@ -396,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) {
@@ -435,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();
}
@@ -459,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;
@@ -490,8 +381,8 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
parent.remove_from_parent();
}
}
- boolean canRemove()
- {
+
+ boolean canRemove() {
if (content != null && !content.isEmpty())
return false;
if (this.hasChildren())
@@ -500,24 +391,24 @@ 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();
}
+
@Override
- public void clear() {
- root = new QBLevel();
+ 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);
@@ -526,8 +417,7 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
}
@Override
- public boolean retainAll(Collection<?> objects)
- {
+ public boolean retainAll(Collection<?> objects) {
for (T o : this) {
if (objects.contains(o)) {
continue;
@@ -537,127 +427,110 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
}
return true;
}
+
@Override
- public boolean removeAll(Collection<?> objects)
- {
+ public boolean removeAll(Collection<?> objects) {
boolean changed = false;
for (Object o : objects) {
changed = changed | remove(o);
}
return changed;
}
+
@Override
- public boolean addAll(Collection<? extends T> objects)
- {
+ public boolean addAll(Collection<? extends T> objects) {
boolean changed = false;
for (T o : objects) {
changed = changed | this.add(o);
}
return changed;
}
+
@Override
- public boolean containsAll(Collection<?> objects)
- {
+ 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;
}
+
@Override
- public Object[] toArray()
- {
+ public Object[] toArray() {
return this.toArrayList().toArray();
}
+
@Override
- public <A> A[] toArray(A[] template)
- {
+ 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;
}
+
@Override
- public boolean hasNext()
- {
+ 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) {
@@ -665,31 +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);
}
+
@Override
- public T next()
- {
+ 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;
}
+
@Override
- public void remove()
- {
+ public void remove() {
// two uses
// 1. Back up to the thing we just returned
// 2. move the index back since we removed
@@ -699,61 +561,47 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
current_node.remove_content(object);
}
}
+
@Override
- public Iterator<T> iterator()
- {
+ public Iterator<T> iterator() {
return new QuadBucketIterator(this);
}
+
@Override
public int size() {
return size;
}
@Override
- public boolean isEmpty()
- {
+ 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);
@@ -763,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;
}
@@ -773,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 7ccb961..be38f35 100644
--- a/src/org/openstreetmap/josm/data/osm/Relation.java
+++ b/src/org/openstreetmap/josm/data/osm/Relation.java
@@ -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);
@@ -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/RelationMember.java b/src/org/openstreetmap/josm/data/osm/RelationMember.java
index 0510bc0..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,7 +122,7 @@ 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
* @throws IllegalArgumentException thrown if member is <code>null</code>
diff --git a/src/org/openstreetmap/josm/data/osm/Storage.java b/src/org/openstreetmap/josm/data/osm/Storage.java
index 1da7dcb..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;
@@ -111,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);
}
@@ -143,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.
@@ -385,7 +372,7 @@ 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) {
@@ -439,7 +426,7 @@ public class Storage<T> extends AbstractSet<T> {
@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());
diff --git a/src/org/openstreetmap/josm/data/osm/TagCollection.java b/src/org/openstreetmap/josm/data/osm/TagCollection.java
index 9dfd818..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
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 8f37088..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,12 +110,16 @@ 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;
@@ -129,7 +137,7 @@ public class User {
*
* @return list of names
*/
- public ArrayList<String> getNames() {
+ public List<String> getNames() {
return new ArrayList<String>(names);
}
@@ -174,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;
}
@@ -204,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 db73d35..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;
@@ -231,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();
}
}
@@ -720,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/WaySegment.java b/src/org/openstreetmap/josm/data/osm/WaySegment.java
index 4b1b60a..878beff 100644
--- a/src/org/openstreetmap/josm/data/osm/WaySegment.java
+++ b/src/org/openstreetmap/josm/data/osm/WaySegment.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Gabriel Ebner
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
/**
@@ -49,7 +49,7 @@ public final class WaySegment implements Comparable<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;
}
diff --git a/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java b/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java
index 1f3c379..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.
diff --git a/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java b/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
index 1df5bc8..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,14 +58,14 @@ 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);
}
diff --git a/src/org/openstreetmap/josm/data/osm/history/History.java b/src/org/openstreetmap/josm/data/osm/history/History.java
index b77a41f..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,7 +62,7 @@ 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>() {
@@ -76,7 +76,7 @@ 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>() {
@@ -240,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 7844461..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,12 +180,21 @@ 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 */
/* ------------------------------------------------------------------------------ */
@@ -169,7 +204,7 @@ public class HistoryDataSet implements LayerChangeListener{
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/HistoryOsmPrimitive.java b/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java
index 590cd83..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));
+ }
}
/**
@@ -171,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.
@@ -248,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 37228a3..71b3396 100644
--- a/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java
+++ b/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java
@@ -20,7 +20,7 @@ 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}.
@@ -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/AllNodesVisitor.java b/src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java
index 4a77231..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;
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java b/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java
index f438e1f..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;
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java b/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java
index 412801c..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
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/Visitor.java b/src/org/openstreetmap/josm/data/osm/visitor/Visitor.java
index e178440..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;
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 42823a7..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();
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 d04efa4..a2228ff 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
@@ -36,7 +36,7 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
* </pre>
*
*/
-public class MapRendererFactory {
+public final class MapRendererFactory {
/** preference key for the renderer class name. Default: class name for {@link StyledMapRenderer}
*
@@ -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);
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 434c534..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,10 +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,9 +29,9 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+
import javax.swing.AbstractButton;
import javax.swing.FocusManager;
-import javax.swing.ImageIcon;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
@@ -441,6 +442,48 @@ public class StyledMapRenderer extends AbstractMapRenderer {
}
}
+ /**
+ * 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) {
Shape area = path.createTransformedShape(nc.getAffineTransform());
@@ -454,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);
@@ -467,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;
@@ -478,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),
@@ -499,16 +532,10 @@ 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);
}
}
@@ -587,24 +614,7 @@ 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);
}
@@ -884,11 +894,8 @@ public class StyledMapRenderer extends AbstractMapRenderer {
}
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);
@@ -1150,18 +1157,7 @@ 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);
}
/**
@@ -1333,7 +1329,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
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());
@@ -1396,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);
@@ -1413,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 9d86b37..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;
@@ -156,7 +156,7 @@ public class WireframeMapRenderer extends AbstractMapRenderer implements Visitor
@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);
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 905eab5..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;
@@ -212,7 +212,7 @@ public class Multipolygon {
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());
@@ -291,11 +291,11 @@ 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 (Long wayId : wayIds) {
Way w = (Way) ds.getPrimitiveById(wayId, OsmPrimitiveType.WAY);
@@ -303,7 +303,9 @@ public class Multipolygon {
waysToJoin.add(w);
}
}
- nodes.addAll(joinWays(waysToJoin).iterator().next().getNodes());
+ if (!waysToJoin.isEmpty()) {
+ nodes.addAll(joinWays(waysToJoin).iterator().next().getNodes());
+ }
}
resetPoly();
}
@@ -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;
}
@@ -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 da97bf4..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
@@ -37,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/projection/AbstractProjection.java b/src/org/openstreetmap/josm/data/projection/AbstractProjection.java
index 8f61298..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 c504738..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);
@@ -276,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);
}
@@ -326,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);
@@ -450,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/Projections.java b/src/org/openstreetmap/josm/data/projection/Projections.java
index c919157..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);
}
}
diff --git a/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java b/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java
index 1cc2fe3..af243b9 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java
@@ -9,7 +9,7 @@ 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/NTV2GridShiftFile.java b/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
index 6db9f84..e2f75c2 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;
import org.openstreetmap.josm.tools.Utils;
@@ -62,7 +65,6 @@ import org.openstreetmap.josm.tools.Utils;
*/
public class NTV2GridShiftFile implements Serializable {
- private String overviewHeaderCountId;
private int overviewHeaderCount;
private int subGridHeaderCount;
private int subGridCount;
@@ -78,6 +80,9 @@ public class NTV2GridShiftFile implements Serializable {
private NTV2SubGrid[] topLevelSubGrid;
private NTV2SubGrid lastSubGrid;
+ /**
+ * Constructs a new {@code NTV2GridShiftFile}.
+ */
public NTV2GridShiftFile() {
}
@@ -91,7 +96,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];
@@ -100,7 +105,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);
@@ -163,7 +168,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++;
@@ -176,13 +181,13 @@ 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());
+ 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 c84dec8..1e5f5e6 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java
@@ -1,36 +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.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 f647b62..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];
@@ -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,14 +328,15 @@ 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;
}
@@ -364,5 +371,4 @@ public class NTV2SubGrid implements Cloneable, Serializable {
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/WGS84Datum.java b/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java
index 40253cd..1789763 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java
@@ -8,7 +8,7 @@ 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 8050169..f13f8a8 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.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.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.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 cf47c37..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;
@@ -37,6 +38,7 @@ 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;
@@ -60,8 +62,7 @@ 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>
*/
@@ -82,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
@@ -111,7 +112,22 @@ public class OsmValidator implements LayerChangeListener {
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}.
@@ -128,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/";
}
@@ -150,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);
}
@@ -159,6 +175,8 @@ public class OsmValidator implements LayerChangeListener {
// Ignore
} catch (final IOException e) {
e.printStackTrace();
+ } finally {
+ Utils.close(in);
}
}
}
@@ -194,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) {
@@ -252,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);
}
/**
diff --git a/src/org/openstreetmap/josm/data/validation/Test.java b/src/org/openstreetmap/josm/data/validation/Test.java
index a5765dc..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()) {
+ 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) {}
@@ -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 aa71094..a659d11 100644
--- a/src/org/openstreetmap/josm/data/validation/TestError.java
+++ b/src/org/openstreetmap/josm/data/validation/TestError.java
@@ -27,7 +27,7 @@ import org.openstreetmap.josm.data.validation.util.MultipleNameVisitor;
/**
* Validation error
- * @author frsantos
+ * @since 3669
*/
public class TestError implements Comparable<TestError>, DataSetListener {
/** is this error on the ignore list */
@@ -51,7 +51,7 @@ public class TestError implements Comparable<TestError>, DataSetListener {
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
@@ -169,7 +169,7 @@ public class TestError implements Comparable<TestError>, DataSetListener {
*/
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())
@@ -185,9 +185,9 @@ public class TestError implements Comparable<TestError>, DataSetListener {
strings.add(type + "_" + o.getId());
}
for (String o : strings) {
- ignorestring += ":" + o;
+ ignorestring.append(":").append(o);
}
- return ignorestring;
+ return ignorestring.toString();
}
public String getIgnoreSubGroup() {
diff --git a/src/org/openstreetmap/josm/data/validation/tests/Addresses.java b/src/org/openstreetmap/josm/data/validation/tests/Addresses.java
index 16e3ccc..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;
@@ -53,8 +54,8 @@ 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);
}
}
@@ -145,12 +146,12 @@ 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));
+ tr("Duplicate house numbers"), tr(englishDescription, entry.getKey()), englishDescription));
}
}
// Report wrong street names
@@ -192,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()) {
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 e9f6fc6..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)) {
@@ -143,10 +150,8 @@ 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;
@@ -182,6 +187,9 @@ public class BuildingInBuilding extends Test {
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 96879ea..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,10 +150,10 @@ 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);
}
@@ -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 36b3b51..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,12 +132,14 @@ public class CrossingWays extends Test {
continue;
}
- if (("abandoned".equals(es1.railway)) || ("abandoned".equals(railway2))) {
+ 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);
@@ -139,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");
@@ -151,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);
@@ -186,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 c7a7bbc..7012402 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java
@@ -4,10 +4,13 @@ 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;
@@ -20,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").
@@ -45,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").
@@ -85,13 +93,61 @@ public class DeprecatedTags extends Test {
checks.add(new DeprecationCheck(2116).
testAndRemove("amenity", "emergency_phone").
add("emergency", "phone"));
- // http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_football
- // fix #8132
+ // 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)) {
@@ -115,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();
@@ -174,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));
@@ -189,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;
@@ -203,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 73d48de..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(
@@ -103,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
@@ -152,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>();
@@ -200,8 +207,8 @@ 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++;
}
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java b/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java
index e2e69b2..8713add 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java
@@ -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()) {
@@ -91,7 +91,7 @@ public class DuplicateRelation extends Test {
if (src.isRelation()) {
Relation r = src.getRelation();
tags = r.getKeys();
- rel_id = r.getId();
+ relId = r.getId();
coor = new ArrayList<LatLon>();
}
}
@@ -102,7 +102,7 @@ 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
@@ -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
@@ -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 855cbd3..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() {
@@ -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);
@@ -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
index 51eb4c0..08cda49 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/Highways.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/Highways.java
@@ -7,12 +7,15 @@ 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;
@@ -27,9 +30,36 @@ import org.openstreetmap.josm.tools.Utils;
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", "trunk", "primary", "secondary", "tertiary", "living_street", "residential", "unclassified");
+ "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.
@@ -37,59 +67,153 @@ public class Highways extends 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),
+ 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")) {
- 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);
- }
+ 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 TestError(this, Severity.WARNING,
- tr("Incorrect roundabout (highway: {0} instead of {1})", w.get("highway"), s),
- WRONG_ROUNDABOUT_HIGHWAY, w));
- }
- break;
- }
+ }
+ }
+ // 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;
@@ -98,8 +222,12 @@ public class Highways extends Test {
@Override
public Command fixError(TestError testError) {
if (testError instanceof WrongRoundaboutHighway) {
- return new ChangePropertyCommand(testError.getPrimitives().iterator().next(),
- "highway", ((WrongRoundaboutHighway) testError).correctValue);
+ // 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 e6d513c..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,12 +275,13 @@ 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()));
+ }
}
}
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java b/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java
index bdc5d0e..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 e876464..6d4b6ff 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/NodesDuplicatingWayTags.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/NodesDuplicatingWayTags.java
@@ -26,6 +26,9 @@ 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 d9cb350..522a595 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/NodesWithSameName.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/NodesWithSameName.java
@@ -15,22 +15,31 @@ 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");
@@ -47,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 0834083..775a5a8 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/OverlappingAreas.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/OverlappingAreas.java
@@ -17,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."));
}
@@ -85,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 25a959c..7fe03b0 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java
@@ -13,6 +13,7 @@ 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>, Set<WaySegment>> ways_seen = new HashMap<List<Way>, Set<WaySegment>>(500);
+ Map<List<Way>, Set<WaySegment>> seenWays = new HashMap<List<Way>, Set<WaySegment>>(500);
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 acfd85e..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,7 +154,7 @@ 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
@@ -159,7 +181,7 @@ public class PowerLines extends Test {
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 n The node to be tested
@@ -168,7 +190,7 @@ public class PowerLines extends Test {
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
@@ -179,16 +201,18 @@ public class PowerLines extends Test {
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 d15cd43..d61a225 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
@@ -58,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.
@@ -78,13 +78,12 @@ 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")
@@ -128,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());
}
}
@@ -144,6 +141,7 @@ public class RelationChecker extends Test {
RELATION_EMPTY, n) );
} else {
LinkedList<String> done = new LinkedList<String>();
+ String errorMessage = tr("Role verification problem");
for (Role r : allroles) {
done.add(r.key);
String keyname = r.key;
@@ -156,16 +154,16 @@ 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));
}
}
@@ -195,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));
}
@@ -205,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));
}
}
@@ -218,9 +216,6 @@ public class RelationChecker extends Test {
}
}
- /* (non-Javadoc)
- * @see org.openstreetmap.josm.data.validation.Test#fixError(org.openstreetmap.josm.data.validation.TestError)
- */
@Override
public Command fixError(TestError testError) {
if (isFixable(testError)) {
@@ -229,9 +224,6 @@ public class RelationChecker extends Test {
return null;
}
- /* (non-Javadoc)
- * @see org.openstreetmap.josm.data.validation.Test#isFixable(org.openstreetmap.josm.data.validation.TestError)
- */
@Override
public boolean isFixable(TestError testError) {
Collection<? extends OsmPrimitive> primitives = testError.getPrimitives();
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 bad61b7..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
diff --git a/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java b/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
index 8078e6d..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;
@@ -57,22 +56,27 @@ 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;
@@ -150,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
@@ -204,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;
@@ -212,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;
@@ -258,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) == '+') {
@@ -266,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);
}
}
@@ -304,13 +310,10 @@ public class TagChecker extends Test
for (TaggingPreset p : presets) {
for (TaggingPresetItem i : p.data) {
if (i instanceof KeyedItem) {
- KeyedItem ky = (KeyedItem) i;
- if (ky.key != null && ky.getValues() != null) {
- try {
- presetsValueData.putAll(ky.key, ky.getValues());
- } catch (NullPointerException e) {
- System.err.println(p+": Unable to initialize "+ky);
- }
+ addPresetValue(p, (KeyedItem) i);
+ } else if (i instanceof CheckGroup) {
+ for (Check c : ((CheckGroup) i).checks) {
+ addPresetValue(p, c);
}
}
}
@@ -318,6 +321,16 @@ public class TagChecker extends Test
}
}
+ 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);
@@ -348,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) {
@@ -366,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();
@@ -509,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."));
@@ -668,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();
@@ -685,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
@@ -715,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));
}
}
}
@@ -740,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
@@ -761,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;
@@ -769,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;
@@ -821,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 50196aa..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()) {
diff --git a/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java b/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java
index c3f376d..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 ("riverbank".equals(test)) {
- 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 a7ac7d4..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 {
@@ -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) {
@@ -348,7 +329,9 @@ public class UnconnectedWays extends Test {
@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 6c23b66..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,11 +38,6 @@ 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) {
@@ -54,10 +48,11 @@ public class UntaggedNode extends Test {
@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 71f5d58..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,7 +49,7 @@ 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 */
@@ -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 81687b3..cfde422 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java
@@ -15,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."));
}
@@ -35,8 +42,7 @@ public class WayConnectedToArea extends Test {
break;
}
}
- if(!hasway)
- {
+ if (!hasway) {
for (OsmPrimitive p : r) {
testForError(w, w.firstNode(), p);
}
@@ -49,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/MultipleNameVisitor.java b/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java
index a8c07ce..d1ec495 100644
--- a/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java
+++ b/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java
@@ -22,7 +22,7 @@ public class MultipleNameVisitor extends NameVisitor
/** 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,10 +43,10 @@ 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.accept(this);
@@ -63,7 +63,7 @@ public class MultipleNameVisitor extends NameVisitor
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 {
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 86346b0..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;
/**
diff --git a/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java b/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
index c095f36..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
@@ -410,14 +410,6 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
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) {
@@ -506,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) {
@@ -679,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 b06c720..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);
@@ -292,7 +289,7 @@ 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);
diff --git a/src/org/openstreetmap/josm/gui/ExtendedDialog.java b/src/org/openstreetmap/josm/gui/ExtendedDialog.java
index c796dd0..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;
/**
@@ -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;
}
@@ -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;
}
@@ -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;
@@ -548,6 +570,7 @@ 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 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);
@@ -571,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) {
+ 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));
}
@@ -622,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 9ea4c42..539760c 100644
--- a/src/org/openstreetmap/josm/gui/FileDrop.java
+++ b/src/org/openstreetmap/josm/gui/FileDrop.java
@@ -473,49 +473,6 @@ public class FileDrop
/* ******** I N N E R C L A S S ******** */
/**
- * This is the event that is passed to the
- * {@link FileDrop.Listener#filesDropped filesDropped(...)} method in
- * your {@link FileDrop.Listener} 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 EventObject {
-
- private 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
- * @param source The event source
- */
- public Event( 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
- */
- public 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,
diff --git a/src/org/openstreetmap/josm/gui/GettingStarted.java b/src/org/openstreetmap/josm/gui/GettingStarted.java
index eaf8af2..2fedd72 100644
--- a/src/org/openstreetmap/josm/gui/GettingStarted.java
+++ b/src/org/openstreetmap/josm/gui/GettingStarted.java
@@ -129,7 +129,7 @@ public final 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>";
}
@@ -139,7 +139,6 @@ public final class GettingStarted extends JPanel {
@Override
public void run() {
lg.setText(fixImageLinks(content));
- // lg.moveCaretPosition(0);
}
});
}
@@ -151,7 +150,7 @@ public final 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 13fedb9..6189af5 100644
--- a/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
+++ b/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
@@ -33,8 +33,12 @@ 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 final String text;
public final Icon icon;
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 a5788e4..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;
diff --git a/src/org/openstreetmap/josm/gui/ImageryMenu.java b/src/org/openstreetmap/josm/gui/ImageryMenu.java
index 819437a..fbdfd83 100644
--- a/src/org/openstreetmap/josm/gui/ImageryMenu.java
+++ b/src/org/openstreetmap/josm/gui/ImageryMenu.java
@@ -26,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;
@@ -79,7 +79,7 @@ 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(JMenu subMenu) {
super(tr("Imagery"));
@@ -178,7 +178,7 @@ public class ImageryMenu extends JMenu implements MapView.LayerChangeListener {
}
private JMenuItem getNewOffsetMenu(){
- if (Main.map == null || Main.map.mapView == null) {
+ if (!Main.isDisplayingMapView()) {
offsetAction.setEnabled(false);
return singleOffset;
}
diff --git a/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java b/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java
index 3d72bca..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) {
@@ -198,7 +199,7 @@ public class JosmUserIdentityManager implements PreferenceChangedListener{
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
}
}
@@ -271,7 +272,7 @@ public class JosmUserIdentityManager implements PreferenceChangedListener{
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 8483012..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;
@@ -37,6 +37,9 @@ 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);
@@ -97,7 +100,7 @@ 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));
@@ -162,7 +165,7 @@ 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) {
diff --git a/src/org/openstreetmap/josm/gui/MainApplication.java b/src/org/openstreetmap/josm/gui/MainApplication.java
index c30bf8b..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;
@@ -42,6 +41,7 @@ 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;
@@ -50,6 +50,7 @@ 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;
/**
@@ -83,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);
@@ -91,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
@@ -121,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;
@@ -153,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;
}
@@ -243,7 +272,7 @@ public class MainApplication extends Main {
I18n.set(args.get(Option.LANGUAGE).iterator().next());
}
- Main.pref = new Preferences();
+ initApplicationPreferences();
Policy.setPolicy(new Policy() {
// Permissions for plug-ins loaded when josm is started via webstart
@@ -272,7 +301,7 @@ public class MainApplication extends Main {
// call the really early hook before we do anything else
Main.platform.preStartupHook();
- Main.commandLineArgs = argArray;
+ Main.commandLineArgs = Utils.copyArray(argArray);
if (args.containsKey(Option.VERSION)) {
System.out.println(Version.getInstance().getAgentString());
@@ -292,7 +321,7 @@ public class MainApplication extends Main {
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 {
config.openAndReadXML(Utils.openURL(new URL(i)));
} catch (Exception ex) {
@@ -367,16 +396,13 @@ public class MainApplication extends Main {
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();
}
@@ -418,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 2903b24..497b7ef 100644
--- a/src/org/openstreetmap/josm/gui/MainMenu.java
+++ b/src/org/openstreetmap/josm/gui/MainMenu.java
@@ -84,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;
@@ -108,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;
@@ -123,91 +126,183 @@ 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 restart = new RestartAction();
- 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)
@@ -225,20 +320,25 @@ public class MainMenu extends JMenuBar {
* @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..."));
- public final ImageryMenu imageryMenu =
- (ImageryMenu)addMenu(new ImageryMenu(imagerySubMenu), marktr("Imagery"), KeyEvent.VK_I, 8, ht("/Menu/Imagery"));
- /**
+ /**
+ * 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
@@ -252,16 +352,21 @@ public class MainMenu extends JMenuBar {
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;
+ /**
+ * helpMenu contains JOSM general actions (Help, About, etc.)
+ */
public final JMenu helpMenu = addMenu(marktr("Help"), KeyEvent.VK_H, 11, ht("/Menu/Help"));
- private final int defaultMenuPos = 11;
+ 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();
@@ -394,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())
@@ -415,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());
@@ -458,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);
@@ -466,6 +573,9 @@ public class MainMenu extends JMenuBar {
return menu;
}
+ /**
+ * Constructs a new {@code MainMenu}.
+ */
public MainMenu() {
JMenuItem current;
@@ -480,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);
@@ -569,6 +678,7 @@ public class MainMenu extends JMenuBar {
dialogsToggleAction.addButtonModel(dialogsToggle.getModel());
viewMenu.add(dialogsToggle);
+ add(viewMenu, jumpToAct, true);
viewMenu.addSeparator();
add(viewMenu, info);
add(viewMenu, infoweb);
@@ -584,11 +694,19 @@ 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(selectionMenu, selectAll);
add(selectionMenu, unselectAll);
+ 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();
@@ -602,22 +720,22 @@ 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);
@@ -672,12 +790,9 @@ 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
diff --git a/src/org/openstreetmap/josm/gui/MapFrame.java b/src/org/openstreetmap/josm/gui/MapFrame.java
index ed18e08..61113b1 100644
--- a/src/org/openstreetmap/josm/gui/MapFrame.java
+++ b/src/org/openstreetmap/josm/gui/MapFrame.java
@@ -143,8 +143,6 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
private final JPanel leftPanel;
private final DialogsPanel dialogsPanel;
- private final boolean unregisterTab;
-
/**
* Default width of the toggle dialog area.
*/
@@ -214,23 +212,23 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
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));
+ 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);
@@ -238,7 +236,7 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
statusLine = new MapStatus(this);
MapView.addLayerChangeListener(this);
- unregisterTab = Shortcut.findShortcut(KeyEvent.VK_TAB, 0)!=null;
+ 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);
@@ -428,7 +426,7 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
* sideToolBar: add dynamic popup menu
*/
sideToolBar.setComponentPopupMenu(new JPopupMenu() {
- final int staticMenuEntryCount = 2;
+ static final int staticMenuEntryCount = 2;
JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar")) {
@Override
public void actionPerformed(ActionEvent e) {
@@ -599,8 +597,9 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
}
}
- /*
- * 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();
for (int i=0; i<n; i++) {
@@ -608,7 +607,6 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
if (type.isInstance(c)) {
leftPanel.remove(i);
leftPanel.doLayout();
- // repaint();
return;
}
}
diff --git a/src/org/openstreetmap/josm/gui/MapMover.java b/src/org/openstreetmap/josm/gui/MapMover.java
index 83e01d5..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;
diff --git a/src/org/openstreetmap/josm/gui/MapSlider.java b/src/org/openstreetmap/josm/gui/MapSlider.java
index 6580c40..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;
diff --git a/src/org/openstreetmap/josm/gui/MapStatus.java b/src/org/openstreetmap/josm/gui/MapStatus.java
index f98ea7b..7148355 100644
--- a/src/org/openstreetmap/josm/gui/MapStatus.java
+++ b/src/org/openstreetmap/josm/gui/MapStatus.java
@@ -23,6 +23,7 @@ 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;
@@ -129,7 +130,7 @@ public class MapStatus extends JPanel implements Helpful, Destroyable {
@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);
}
}
@@ -145,7 +146,6 @@ public class MapStatus extends JPanel implements Helpful, Destroyable {
final JProgressBar progressBar = new JProgressBar();
public final BackgroundProgressMonitor progressMonitor = new BackgroundProgressMonitor();
- private final MouseListener jumpToOnLeftClick;
private final SoMChangeListener somListener;
private double distValue; // Distance value displayed in distText, stored if refresh needed after a change of system of measurement
@@ -218,7 +218,12 @@ public class MapStatus extends JPanel implements Helpful, Destroyable {
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;
}
@@ -281,13 +286,9 @@ public class MapStatus extends JPanel implements Helpful, Destroyable {
// 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>"+
@@ -326,9 +327,9 @@ public class MapStatus extends JPanel implements Helpful, Destroyable {
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) {
@@ -340,8 +341,11 @@ public class MapStatus extends JPanel implements Helpful, Destroyable {
}
}
});
- } 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 {
@@ -712,7 +716,7 @@ public class MapStatus extends JPanel implements Helpful, Destroyable {
});
// also show Jump To dialog on mouse click (except context menu)
- jumpToOnLeftClick = new MouseAdapter() {
+ MouseListener jumpToOnLeftClick = new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
if (e.getButton() != MouseEvent.BUTTON3) {
diff --git a/src/org/openstreetmap/josm/gui/MapView.java b/src/org/openstreetmap/josm/gui/MapView.java
index af4ba9b..6a31d35 100644
--- a/src/org/openstreetmap/josm/gui/MapView.java
+++ b/src/org/openstreetmap/josm/gui/MapView.java
@@ -209,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 final LinkedList<MapViewPaintable> temporaryLayers = new LinkedList<MapViewPaintable>();
+ private final List<MapViewPaintable> temporaryLayers = new LinkedList<MapViewPaintable>();
private BufferedImage nonChangedLayersBuffer;
private BufferedImage offscreenBuffer;
@@ -499,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);
@@ -635,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());
@@ -655,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));
@@ -733,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));
diff --git a/src/org/openstreetmap/josm/gui/MenuScroller.java b/src/org/openstreetmap/josm/gui/MenuScroller.java
index 1fe6862..2e0ba6b 100644
--- a/src/org/openstreetmap/josm/gui/MenuScroller.java
+++ b/src/org/openstreetmap/josm/gui/MenuScroller.java
@@ -1,5 +1,5 @@
/**
- * @(#)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;
@@ -37,7 +37,6 @@ import javax.swing.event.PopupMenuListener;
*/
public class MenuScroller {
- //private JMenu menu;
private JPopupMenu menu;
private Component[] menuItems;
private MenuScrollItem upItem;
@@ -437,7 +436,7 @@ public class MenuScroller {
* @see MenuScroller#dispose()
*/
@Override
- public void finalize() throws Throwable {
+ protected void finalize() throws Throwable {
dispose();
}
diff --git a/src/org/openstreetmap/josm/gui/NavigatableComponent.java b/src/org/openstreetmap/josm/gui/NavigatableComponent.java
index 3db6f2b..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;
@@ -200,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));
}
@@ -400,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);
@@ -476,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)) {
@@ -489,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();
@@ -664,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);
@@ -753,18 +758,19 @@ public class NavigatableComponent extends JComponent implements Helpful {
* @param preferredRefs primitives, whose nodes we prefer
*/
public final Node getNearestNode(Point p, Predicate<OsmPrimitive> predicate,
- boolean use_selected, Collection<OsmPrimitive> preferredRefs) {
+ boolean useSelected, Collection<OsmPrimitive> preferredRefs) {
Map<Double, List<Node>> nlists = getNearestNodesImpl(p, predicate);
if (nlists.isEmpty()) return null;
if (preferredRefs != null && preferredRefs.isEmpty()) preferredRefs = null;
Node ntsel = null, ntnew = null, ntref = null;
- boolean useNtsel = use_selected;
+ boolean useNtsel = useSelected;
double minDistSq = nlists.keySet().iterator().next();
- for (Double distSq : nlists.keySet()) {
- for (Node nd : nlists.get(distSq)) {
+ 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;
@@ -859,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);
@@ -1458,13 +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)
- return formatText(dist / bValue, bName);
- else if (a < 0.01)
- return "< 0.01 " + aName;
+ return formatText(dist / bValue, bName, format);
+ else if (a < threshold)
+ return "< " + formatText(threshold, aName, format);
else
- return formatText(a, aName);
+ return formatText(a, aName, format);
}
/**
@@ -1474,20 +1490,35 @@ 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);
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);
+ return formatText(area / areaCustomValue, areaCustomName, format);
else if (!lowerOnly && a >= (bValue*bValue) / (aValue*aValue))
- return formatText(area / (bValue*bValue), bName+"\u00b2");
- else if (a < 0.01)
- return "< 0.01 " + aName+"\u00b2";
+ return formatText(area / (bValue * bValue), bName + "\u00b2", format);
+ else if (a < threshold)
+ return "< " + formatText(threshold, aName + "\u00b2", format);
else
- return formatText(a, aName+"\u00b2");
+ return formatText(a, aName + "\u00b2", format);
}
- private static String formatText(double v, String unit) {
+ 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);
}
}
@@ -1538,50 +1569,53 @@ 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.isEmpty()) {
- 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.isEmpty()) {
+ if (cursors.isEmpty()) {
setCursor(null);
return;
}
- CursorInfo l = Cursors.getLast();
+ CursorInfo l = cursors.getLast();
stripCursors(reference);
- if(l != null && l.object == reference) {
- if(Cursors.isEmpty()) {
+ 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
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 9e1b9bd..3d5a3b1 100644
--- a/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java
+++ b/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.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;
@@ -69,7 +69,7 @@ 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));
ImageIcon icon = ImageProvider.get(value.getDisplayType());
if (icon != null) {
@@ -90,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 cf6c875..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;
diff --git a/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java b/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java
index 372a46a..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;
diff --git a/src/org/openstreetmap/josm/gui/ScrollViewport.java b/src/org/openstreetmap/josm/gui/ScrollViewport.java
index 529d96d..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;
diff --git a/src/org/openstreetmap/josm/gui/SelectionManager.java b/src/org/openstreetmap/josm/gui/SelectionManager.java
index 3be7838..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;
diff --git a/src/org/openstreetmap/josm/gui/SideButton.java b/src/org/openstreetmap/josm/gui/SideButton.java
index 82579e7..1a856c1 100644
--- a/src/org/openstreetmap/josm/gui/SideButton.java
+++ b/src/org/openstreetmap/josm/gui/SideButton.java
@@ -28,15 +28,13 @@ public class SideButton extends JButton implements Destroyable {
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);
@@ -45,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();
@@ -66,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()));
}
}
@@ -82,17 +79,7 @@ public class SideButton extends JButton implements Destroyable {
return getScaledImage(im);
}
- 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 1f82c65..6dd4bab 100644
--- a/src/org/openstreetmap/josm/gui/SplashScreen.java
+++ b/src/org/openstreetmap/josm/gui/SplashScreen.java
@@ -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);
@@ -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);
@@ -156,7 +158,7 @@ public class SplashScreen extends JFrame {
@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();
}
@@ -197,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>"
diff --git a/src/org/openstreetmap/josm/gui/actionsupport/AlignImageryPanel.java b/src/org/openstreetmap/josm/gui/actionsupport/AlignImageryPanel.java
index 62cdddf..e591108 100644
--- a/src/org/openstreetmap/josm/gui/actionsupport/AlignImageryPanel.java
+++ b/src/org/openstreetmap/josm/gui/actionsupport/AlignImageryPanel.java
@@ -18,9 +18,9 @@ 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.
@@ -64,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));
}
@@ -78,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 d5079f8..c123d61 100644
--- a/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java
+++ b/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java
@@ -16,6 +16,7 @@ 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;
@@ -185,7 +186,7 @@ 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}.
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 64b2413..b697ffe 100644
--- a/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
+++ b/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
@@ -16,7 +16,7 @@ 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;
@@ -41,7 +41,7 @@ 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();
@@ -100,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
@@ -138,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
@@ -174,13 +173,14 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser{
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 = TMSLayer.loaderFactory.makeTileLoader(this);
@@ -190,8 +190,7 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser{
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);
@@ -200,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);
@@ -224,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);
@@ -352,8 +356,8 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser{
*/
@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;
@@ -362,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);
@@ -378,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);
@@ -389,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 b53b142..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,7 +48,6 @@ public class SlippyMapControler extends MouseAdapter implements MouseMotionListe
private Point iStartSelectionPoint;
private Point iEndSelectionPoint;
- // the SlippyMapChooserComponent
private final SlippyMapBBoxChooser iSlippyMapChooser;
private SizeButton iSizeButton = null;
@@ -59,10 +56,10 @@ public class SlippyMapControler extends MouseAdapter implements MouseMotionListe
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);
@@ -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));
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 d419986..5c08685 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;
@@ -49,6 +50,7 @@ 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;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
@@ -67,7 +69,7 @@ import org.openstreetmap.josm.gui.widgets.JosmTextField;
* 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());
* }
* }
* });
@@ -152,10 +154,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);
@@ -341,12 +343,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);
@@ -406,9 +408,6 @@ 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);
@@ -681,10 +680,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/pair/ComparePairType.java b/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java
index 1a6e1ca..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
*
@@ -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 5663a66..ffcce38 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
@@ -275,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 c698059..086e0e3 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
@@ -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;
@@ -692,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);
}
@@ -701,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);
}
@@ -718,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;
}
}
@@ -737,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;
@@ -830,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>();
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java b/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
index d598347..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,26 +415,34 @@ 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 CopyStartLeftAction() {
+ super("copystartleft", tr("> top"), tr("Copy my selected nodes to the start of the merged node list"));
+ }
@Override
- public void actionPerformed(ActionEvent arg0) {
- int [] rows = myEntriesTable.getSelectedRows();
- model.copyMyToTop(rows);
+ public void actionPerformed(ActionEvent e) {
+ model.copyMyToTop(myEntriesTable.getSelectedRows());
}
@Override
@@ -451,24 +454,16 @@ 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."));
}
@Override
- public void actionPerformed(ActionEvent arg0) {
- int [] rows = myEntriesTable.getSelectedRows();
- model.copyMyToEnd(rows);
+ public void actionPerformed(ActionEvent e) {
+ model.copyMyToEnd(myEntriesTable.getSelectedRows());
}
@Override
@@ -480,26 +475,20 @@ 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."));
}
@Override
- public void actionPerformed(ActionEvent arg0) {
- int [] myRows = myEntriesTable.getSelectedRows();
+ 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);
}
@@ -508,7 +497,7 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
public void valueChanged(ListSelectionEvent e) {
setEnabled(
!myEntriesTable.getSelectionModel().isSelectionEmpty()
- && ! mergedEntriesTable.getSelectionModel().isSelectionEmpty()
+ && !mergedEntriesTable.getSelectionModel().isSelectionEmpty()
);
}
}
@@ -516,26 +505,20 @@ 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."));
}
@Override
- public void actionPerformed(ActionEvent arg0) {
- int [] myRows = myEntriesTable.getSelectedRows();
+ 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);
}
@@ -544,27 +527,20 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
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."));
}
@Override
- public void actionPerformed(ActionEvent arg0) {
- int [] rows = theirEntriesTable.getSelectedRows();
- model.copyTheirToTop(rows);
+ public void actionPerformed(ActionEvent e) {
+ model.copyTheirToTop(theirEntriesTable.getSelectedRows());
}
@Override
@@ -573,22 +549,15 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
}
}
- 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
@@ -597,24 +566,19 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
}
}
- 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."));
}
@Override
- public void actionPerformed(ActionEvent arg0) {
- int [] myRows = theirEntriesTable.getSelectedRows();
+ 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);
}
@@ -623,29 +587,24 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
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"));
}
@Override
- public void actionPerformed(ActionEvent arg0) {
- int [] myRows = theirEntriesTable.getSelectedRows();
+ 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);
}
@@ -654,7 +613,7 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
public void valueChanged(ListSelectionEvent e) {
setEnabled(
!theirEntriesTable.getSelectionModel().isSelectionEmpty()
- && ! mergedEntriesTable.getSelectionModel().isSelectionEmpty()
+ && !mergedEntriesTable.getSelectionModel().isSelectionEmpty()
);
}
}
@@ -725,7 +684,7 @@ 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);
}
@@ -927,146 +886,6 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
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
- *
- */
- @Override
- 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() {
- @Override
- 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() {
- @Override
- 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/NodeListTableCellRenderer.java b/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java
index 5bb0921..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) {
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 e08e802..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() {
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 601447c..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) {
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/TagMerger.java b/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
index 6e3d469..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);
@@ -334,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>();
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java b/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java
index 764d6b6..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 {
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 10271e4..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;
@@ -449,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;
}
@@ -461,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.isEmpty() ? msg : text + ", " + msg;
+ if (text.length() > 0) {
+ text.append(", ");
+ }
+ text.append(msg);
}
- setText(text);
+ setText(text.toString());
}
protected void renderFrom(StatisticsInfo info) {
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/RelationMemberConflictResolver.java b/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java
index b9207b4..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);
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java b/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java
index 600bec5..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() {}
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java b/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
index 9a0fa69..71b1f2f 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
@@ -9,6 +9,7 @@ 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;
@@ -23,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);
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
index 3bf3679..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,7 +80,7 @@ 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;
@@ -119,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());
}
}
@@ -131,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
@@ -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",
@@ -307,7 +313,7 @@ public class ChangesetDialog extends ToggleDialog{
@Override
public void actionPerformed(ActionEvent e) {
- if (Main.main.getEditLayer() == null)
+ if (!Main.main.hasEditLayer())
return;
ChangesetListModel model = getCurrentChangesetListModel();
Set<Integer> sel = model.getSelectedChangesetIds();
@@ -506,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());
diff --git a/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java b/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java
index fffe448..e7ad8f0 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.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;
@@ -39,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;
@@ -75,7 +74,10 @@ public class CommandStackDialog extends ToggleDialog implements CommandQueueList
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);
@@ -242,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;
@@ -316,7 +318,7 @@ public class CommandStackDialog extends ToggleDialog implements CommandQueueList
*/
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>(){
@@ -339,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
@@ -358,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"));
@@ -380,7 +385,7 @@ 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");
}
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
index 91cafcc..46f0429 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
@@ -316,7 +316,7 @@ public final class ConflictDialog extends ToggleDialog implements MapView.EditLa
@Override
public void onConflictsRemoved(ConflictCollection conflicts) {
- System.err.println("1 conflict has been resolved.");
+ Main.info("1 conflict has been resolved.");
refreshView();
}
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 3caecbb..0af9598 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.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;
@@ -58,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);
@@ -139,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."));
@@ -152,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."));
@@ -169,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."));
@@ -182,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."));
@@ -197,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."));
diff --git a/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java b/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java
index a467cc4..c273f22 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java
@@ -45,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();
}
@@ -279,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:
@@ -309,6 +315,9 @@ 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 ed2d153..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,
@@ -148,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) {
@@ -174,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));
@@ -226,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));
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java b/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java
index 782e11e..a3614a3 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java
@@ -60,7 +60,6 @@ public class InspectPrimitiveDialog extends ExtendedDialog {
protected List<OsmPrimitive> primitives;
protected OsmDataLayer layer;
- private JosmTextArea txtData;
private JosmTextArea txtMappaint;
boolean mappaintTabLoaded;
@@ -93,7 +92,7 @@ public class InspectPrimitiveDialog extends ExtendedDialog {
protected JPanel buildDataPanel() {
JPanel p = new JPanel(new GridBagLayout());
- txtData = new JosmTextArea();
+ 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)));
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java b/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java
index 48ab72e..8599b77 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java
@@ -162,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);
@@ -339,7 +339,7 @@ public class LatLonDialog extends ExtendedDialog {
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();
@@ -422,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 251bd80..0747c1c 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
@@ -448,6 +448,9 @@ public class LayerListDialog extends ToggleDialog {
}
}
+ /**
+ * Constructs a new {@code ShowHideLayerAction}.
+ */
public ShowHideLayerAction() {
this(true);
}
@@ -639,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"));
@@ -673,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;
}
@@ -743,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"));
@@ -766,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;
}
@@ -810,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"));
@@ -819,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>();
@@ -850,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;
}
@@ -961,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;
}
@@ -1020,10 +1029,10 @@ public class LayerListDialog extends ToggleDialog {
}
class PopupMenuHandler extends PopupMenuLauncher {
- @Override public void launch(MouseEvent evt) {
+ @Override public void showMenu(MouseEvent evt) {
Layer layer = getModel().getLayer(layerList.getSelectedRow());
menu = new LayerListPopup(getModel().getSelectedLayers(), layer);
- super.launch(evt);
+ super.showMenu(evt);
}
}
@@ -1094,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;
@@ -1192,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));
@@ -1209,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);
@@ -1369,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()) {
@@ -1391,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();
}
@@ -1424,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();
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java b/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java
index 4cb7711..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;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java b/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
index c418efb..7090e9a 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
@@ -57,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;
@@ -65,8 +67,8 @@ 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;
@@ -90,6 +92,9 @@ 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}.
*/
@@ -157,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 {
@@ -203,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));
}
}
@@ -407,26 +412,6 @@ public class MapPaintDialog extends ToggleDialog implements Main.WindowSwitchLis
}
}
- /**
- * Opens preferences window and selects the mappaint tab.
- */
- public static class LaunchMapPaintPreferencesAction extends AbstractAction {
- /**
- * Constructs a new {@code LaunchMapPaintPreferencesAction}.
- */
- 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"));
@@ -533,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;
@@ -665,18 +655,23 @@ public class MapPaintDialog extends ToggleDialog implements Main.WindowSwitchLis
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);
}
}
diff --git a/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java b/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java
similarity index 54%
copy from src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java
copy to src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java
index 1296b1e..88eca98 100644
--- a/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java
@@ -1,272 +1,230 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.download;
-
-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.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.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
-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.KeyStroke;
-import javax.swing.border.EtchedBorder;
-import javax.swing.plaf.basic.BasicComboBoxEditor;
-
-import org.openstreetmap.josm.Main;
-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.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.tools.Utils;
-import org.openstreetmap.josm.gui.widgets.JosmTextField;
-
-/**
- * Dialog prompt to user to let him choose OSM primitives to download by specifying their type and IDs
- * @since 5765
- */
-public class DownloadObjectDialog 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 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();
- }
-
- protected void init() {
- GroupLayout layout = new GroupLayout(panel);
- 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));
-
- 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));
-
- 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(fullRel)
- .addComponent(newLayer)
- .addComponent(help)
- );
-
- cbType.addItemListener(new ItemListener() {
- @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(fullRel)
- .addComponent(newLayer)
- .addComponent(help)
- );
- }
-
- @Override
- public void setupDialog() {
-
- setContent(panel, false);
- setButtonIcons(new String[] {"download.png", "cancel.png"});
- setToolTipTexts(new String[] {
- tr("Start downloading"),
- tr("Close dialog and cancel downloading")
- });
- setDefaultButton(1);
- 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);
- }
-
- addWindowListener(this);
- super.setupDialog();
- }
-
- /**
- * 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());
- }
-
- 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);
- }
- }
- }
-
- /**
- * 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();
- }
-
- /**
- * 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 windowClosed(WindowEvent e) {
- if (e != null && e.getComponent() == this && getValue() == 1) {
- Main.pref.putInteger("downloadprimitive.lasttype", cbType.getSelectedIndex());
- Main.pref.put("downloadprimitive.referrers", referrers.isSelected());
- Main.pref.put("downloadprimitive.full", fullRel.isSelected());
- Main.pref.put("download.newlayer", newLayer.isSelected());
-
- if (!tfId.readIds()) {
- JOptionPane.showMessageDialog(getParent(),
- tr("Invalid ID list specified\n"
- + "Cannot download object."),
- 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) {}
-}
+// 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 2d1e342..0b49c88 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
@@ -169,10 +169,6 @@ public class RelationListDialog extends ToggleDialog implements DataSetListener
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
@@ -327,7 +323,7 @@ public class RelationListDialog extends ToggleDialog implements DataSetListener
}
@Override public void mouseClicked(MouseEvent e) {
- if (Main.main.getEditLayer() == null) return;
+ if (!Main.main.hasEditLayer()) return;
if (isDoubleClick(e)) {
if (e.isControlDown()) {
editCurrentRelation();
@@ -360,7 +356,7 @@ public class RelationListDialog extends ToggleDialog implements DataSetListener
}
protected void updateEnabledState() {
- setEnabled(Main.main != null && Main.main.getEditLayer() != null);
+ setEnabled(Main.main != null && Main.main.hasEditLayer());
}
@Override
@@ -385,8 +381,8 @@ public class RelationListDialog extends ToggleDialog implements DataSetListener
*
*/
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;
@@ -541,7 +537,7 @@ public class RelationListDialog extends ToggleDialog implements DataSetListener
* @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;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
index 5119900..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;
@@ -76,7 +76,7 @@ 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;
@@ -167,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();
}
@@ -284,7 +285,7 @@ public class SelectionListDialog extends ToggleDialog {
}
public void updateEnabledState() {
- setEnabled(Main.main != null && Main.main.getEditLayer() != null);
+ setEnabled(Main.main != null && Main.main.hasEditLayer());
}
@Override
@@ -309,8 +310,9 @@ public class SelectionListDialog extends ToggleDialog {
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() {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
index 6a9a121..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;
@@ -32,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;
@@ -72,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
@@ -196,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));
@@ -230,14 +228,14 @@ 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) {
@@ -257,11 +255,6 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
showNotify();
}
}
-
- @Override
- public void destroy() {
- super.destroy();
- }
}
/**
@@ -397,21 +390,22 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
}
}
+ @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();
}
}
@@ -460,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();
@@ -498,9 +490,7 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
// 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(
@@ -855,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();
}
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
index 2b0bbd9..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;
@@ -202,7 +202,7 @@ public class UserListDialog extends ToggleDialog implements SelectionChangedList
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();
@@ -289,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"),"%"});
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
index ecaee4f..1f34dd2 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
@@ -125,7 +125,7 @@ public class ValidatorDialog extends ToggleDialog implements SelectionChangedLis
}
@Override
public void actionPerformed(ActionEvent e) {
- fixErrors(e);
+ fixErrors();
}
});
fixButton.setEnabled(false);
@@ -140,7 +140,7 @@ public class ValidatorDialog extends ToggleDialog implements SelectionChangedLis
}
@Override
public void actionPerformed(ActionEvent e) {
- ignoreErrors(e);
+ ignoreErrors();
}
});
ignoreButton.setEnabled(false);
@@ -182,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;
@@ -223,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();
@@ -377,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());
}
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java
index 36db29f..2f3be81 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java
@@ -29,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);
@@ -75,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)) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java
index 8fd5c53..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);
}
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/ChangesetContentPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
index b85ee55..16f133a 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
@@ -39,7 +39,6 @@ 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;
@@ -47,6 +46,7 @@ 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;
@@ -62,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;
@@ -102,7 +101,7 @@ 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()
@@ -230,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);
@@ -325,7 +324,7 @@ public class ChangesetContentPanel extends JPanel implements PropertyChangeListe
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>();
@@ -343,7 +342,7 @@ 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;
}
@@ -390,7 +389,7 @@ public class ChangesetContentPanel extends JPanel implements PropertyChangeListe
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>();
@@ -409,7 +408,7 @@ 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;
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java
index cc12775..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) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
index 40d46db..76ea05b 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
@@ -385,7 +385,7 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
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()) {
@@ -401,7 +401,7 @@ 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;
}
@@ -446,7 +446,7 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
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()) {
@@ -463,7 +463,7 @@ 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;
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java
index 6887e52..dfde992 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java
@@ -158,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) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java
index 3576532..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();
}
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 2236a65..f11dffb 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
@@ -28,11 +28,11 @@ 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;
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 61c6620..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;
}
}
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 42f38ac..eda7a3c 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java
@@ -109,7 +109,7 @@ 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.
//
@@ -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) {
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 0f24986..fb678ca 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java
@@ -20,6 +20,7 @@ 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;
@@ -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 "
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java b/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java
index 0f9db75..5e850ae 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java
@@ -91,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 55b6735..acb85c7 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
@@ -59,6 +59,8 @@ 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;
@@ -74,7 +76,6 @@ 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;
@@ -96,23 +97,23 @@ 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 {
/**
* hook for roadsigns plugin to display a small button in the upper right corner of this dialog
@@ -120,9 +121,9 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
public static final JPanel pluginHook = new JPanel();
/**
- * The property data of selected objects.
+ * The tag data of selected objects.
*/
- private final DefaultTableModel propertyData = new ReadOnlyTableModel();
+ private final DefaultTableModel tagData = new ReadOnlyTableModel();
/**
* The membership data of selected objects.
@@ -130,27 +131,28 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
private final DefaultTableModel membershipData = new ReadOnlyTableModel();
/**
- * The properties table.
+ * The tags table.
*/
- private final JTable propertyTable = new JTable(propertyData);
+ private final JTable tagTable = new JTable(tagData);
+
/**
* The membership table.
*/
private final JTable membershipTable = new JTable(membershipData);
// Popup menus
- private final JPopupMenu propertyMenu = new JPopupMenu();
+ private final JPopupMenu tagMenu = new JPopupMenu();
private final JPopupMenu membershipMenu = new JPopupMenu();
// Popup menu handlers
- private final PopupMenuHandler propertyMenuHandler = new PopupMenuHandler(propertyMenu);
+ 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 properties
+ * This sub-object is responsible for all adding and editing of tags
*/
- private final TagEditHelper editHelper = new TagEditHelper(propertyData, valueCount);
+ private final TagEditHelper editHelper = new TagEditHelper(tagData, valueCount);
private final DataSetListenerAdapter dataChangedAdapter = new DataSetListenerAdapter(this);
private final HelpAction helpAction = new HelpAction();
@@ -199,7 +201,7 @@ 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>");
private PresetHandler presetHandler = new PresetHandler() {
@Override public void updateTags(List<Tag> tags) {
@@ -220,13 +222,13 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
* Create a new PropertiesDialog
* @param mapFrame The parent map fram
*/
- 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);
- setupPropertiesMenu();
- buildPropertiesTable();
+ setupTagsMenu();
+ buildTagsTable();
setupMembershipMenu();
buildMembershipTable();
@@ -241,8 +243,8 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
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(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) {
@@ -252,9 +254,9 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
setupKeyboardShortcuts();
// Let the action know when selection in the tables change
- propertyTable.getSelectionModel().addListSelectionListener(editAction);
+ tagTable.getSelectionModel().addListSelectionListener(editAction);
membershipTable.getSelectionModel().addListSelectionListener(editAction);
- propertyTable.getSelectionModel().addListSelectionListener(deleteAction);
+ tagTable.getSelectionModel().addListSelectionListener(deleteAction);
membershipTable.getSelectionModel().addListSelectionListener(deleteAction);
@@ -263,7 +265,7 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
}));
MouseClickWatch mouseClickWatch = new MouseClickWatch();
- propertyTable.addMouseListener(mouseClickWatch);
+ tagTable.addMouseListener(mouseClickWatch);
membershipTable.addMouseListener(mouseClickWatch);
scrollPane.addMouseListener(mouseClickWatch);
@@ -271,41 +273,20 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
presets.setSize(scrollPane.getSize());
editHelper.loadTagsIfNeeded();
+
+ Main.pref.addPreferenceChangeListener(this);
}
- private void buildPropertiesTable() {
- // setting up the properties table
+ private void buildTagsTable() {
+ // setting up the tags table
- propertyData.setColumnIdentifiers(new String[]{tr("Key"),tr("Value")});
- propertyTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
- propertyTable.getTableHeader().setReorderingAllowed(false);
+ tagData.setColumnIdentifiers(new String[]{tr("Key"),tr("Value")});
+ tagTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+ tagTable.getTableHeader().setReorderingAllowed(false);
- 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).putClientProperty("html.disable", Boolean.TRUE); // Fix #8730
- ((JLabel)c).setText(str);
- }
- return c;
- }
- });
+ PropertiesCellRenderer cellRenderer = new PropertiesCellRenderer();
+ tagTable.getColumnModel().getColumn(0).setCellRenderer(cellRenderer);
+ tagTable.getColumnModel().getColumn(1).setCellRenderer(cellRenderer);
}
private void buildMembershipTable() {
@@ -433,19 +414,19 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
}
/**
- * creates the popup menu @field propertyMenu and its launcher on property table
+ * creates the popup menu @field tagMenu and its launcher on tag table
*/
- private void setupPropertiesMenu() {
- 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);
- propertyTable.addMouseListener(new PopupMenuLauncher(propertyMenu));
+ 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));
}
/**
@@ -454,27 +435,27 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
private void setupKeyboardShortcuts() {
// ENTER = editAction, open "edit" dialog
- propertyTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+ 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);
- // INSERT button = addAction, open "add property" dialog
- 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);
+ tagTable.getActionMap().put("onTableInsert",addAction);
// unassign some standard shortcuts for JTable to allow upload / download
- InputMapUtils.unassignCtrlShiftUpDown(propertyTable, JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+ InputMapUtils.unassignCtrlShiftUpDown(tagTable, JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
// unassign some standard shortcuts for correct copy-pasting, fix #8508
- propertyTable.setTransferHandler(null);
+ tagTable.setTransferHandler(null);
- propertyTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+ tagTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
.put(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK),"onCopy");
- propertyTable.getActionMap().put("onCopy",copyKeyValueAction);
+ tagTable.getActionMap().put("onCopy",copyKeyValueAction);
// allow using enter to add tags for all look&feel configurations
InputMapUtils.enableEnter(this.btnAdd);
@@ -501,7 +482,7 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
Relation relation = (Relation)membershipData.getValueAt(row, 0);
Main.map.relationListDialog.selectRelation(relation);
RelationEditor.getEditor(
- Main.map.mapView.getEditLayer(),
+ Main.main.getEditLayer(),
relation,
((MemberInfo) membershipData.getValueAt(row, 1)).role).setVisible(true);
}
@@ -550,17 +531,25 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
}
}
- @Override
- public void setVisible(boolean b) {
- super.setVisible(b);
- if (b && Main.main.getCurrentDataSet() != null) {
- selectionChanged(Main.main.getCurrentDataSet().getSelected());
- }
+ /**
+ * 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);
}
@Override
public void destroy() {
super.destroy();
+ Main.pref.removePreferenceChangeListener(this);
for (JosmAction action : josmActions) {
action.destroy();
}
@@ -574,25 +563,26 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
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;
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();
@@ -600,15 +590,17 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
for (OsmPrimitive osm : newSelection) {
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);
+ }
}
}
}
@@ -620,7 +612,7 @@ 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>"));
}
@@ -669,32 +661,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()));
+ if(tagData.getRowCount() != 0 || membershipData.getRowCount() != 0) {
+ setTitle(tr("Tags: {0} / Memberships: {1}",
+ tagData.getRowCount(), membershipData.getRowCount()));
} else {
- setTitle(tr("Properties / Memberships"));
+ setTitle(tr("Tags / Memberships"));
}
}
@@ -722,20 +714,20 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
// <editor-fold defaultstate="collapsed" desc="Methods that are called by plugins to extend fuctionality ">
/**
- * Replies the property popup menu handler.
- * @return The property popup menu handler
+ * Replies the tag popup menu handler.
+ * @return The tag popup menu handler
*/
public PopupMenuHandler getPropertyPopupMenuHandler() {
- return propertyMenuHandler;
+ return tagMenuHandler;
}
@SuppressWarnings("unchecked")
public Tag getSelectedProperty() {
- int row = propertyTable.getSelectedRow();
+ int row = tagTable.getSelectedRow();
if (row == -1) return null;
- TreeMap<String, Integer> map = (TreeMap<String, Integer>) propertyData.getValueAt(row, 1);
+ TreeMap<String, Integer> map = (TreeMap<String, Integer>) tagData.getValueAt(row, 1);
return new Tag(
- propertyData.getValueAt(row, 0).toString(),
+ tagData.getValueAt(row, 0).toString(),
map.size() > 1 ? "" : map.keySet().iterator().next());
}
@@ -763,21 +755,21 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
if (e.getClickCount() < 2)
{
// single click, clear selection in other table not clicked in
- if (e.getSource() == propertyTable) {
+ if (e.getSource() == tagTable) {
membershipTable.clearSelection();
} else if (e.getSource() == membershipTable) {
- propertyTable.clearSelection();
+ tagTable.clearSelection();
}
}
- // double click, edit or add property
- else if (e.getSource() == propertyTable)
+ // double click, edit or add tag
+ else if (e.getSource() == tagTable)
{
- int row = propertyTable.rowAtPoint(e.getPoint());
+ int row = tagTable.rowAtPoint(e.getPoint());
if (row > -1) {
- boolean focusOnKey = (propertyTable.columnAtPoint(e.getPoint()) == 0);
- editHelper.editProperty(row, focusOnKey);
+ boolean focusOnKey = (tagTable.columnAtPoint(e.getPoint()) == 0);
+ editHelper.editTag(row, focusOnKey);
} else {
- editHelper.addProperty();
+ editHelper.addTag();
btnAdd.requestFocusInWindow();
}
} else if (e.getSource() == membershipTable) {
@@ -788,15 +780,15 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
}
else
{
- editHelper.addProperty();
+ editHelper.addTag();
btnAdd.requestFocusInWindow();
}
}
@Override public void mousePressed(MouseEvent e) {
- if (e.getSource() == propertyTable) {
+ if (e.getSource() == tagTable) {
membershipTable.clearSelection();
} else if (e.getSource() == membershipTable) {
- propertyTable.clearSelection();
+ tagTable.clearSelection();
}
}
@@ -821,16 +813,16 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
if (cur == last + 1) {
++cnt;
} else if (cnt == 0) {
- positionString += "," + String.valueOf(cur);
+ positionString += "," + cur;
} else {
- positionString += "-" + String.valueOf(last);
- positionString += "," + String.valueOf(cur);
+ positionString += "-" + last;
+ positionString += "," + cur;
cnt = 0;
}
last = cur;
}
if (cnt >= 1) {
- positionString += "-" + String.valueOf(last);
+ positionString += "-" + last;
}
}
if (positionString.length() > 20) {
@@ -850,7 +842,7 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
@Override public Class<?> getColumnClass(int columnIndex) {
return String.class;
}
- };
+ }
/**
* Action handling delete button press in properties dialog.
@@ -859,26 +851,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
@@ -887,7 +879,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();
@@ -895,7 +887,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);
}
}
@@ -926,7 +918,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);
}
@@ -934,9 +926,9 @@ 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[] rows = membershipTable.getSelectedRows();
// delete from last relation to convserve row numbers in the table
@@ -949,7 +941,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() > 0)
);
}
@@ -966,13 +958,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();
}
}
@@ -983,7 +975,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();
}
@@ -992,9 +984,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);
@@ -1004,7 +996,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)
);
}
@@ -1029,11 +1021,11 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
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)));
@@ -1120,9 +1112,9 @@ 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 clipboard = Utils.getClipboardContent();
if (sel.isEmpty() || clipboard == null)
@@ -1137,13 +1129,13 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
@Override
public void actionPerformed(ActionEvent ae) {
- int[] rows = propertyTable.getSelectedRows();
+ int[] rows = tagTable.getSelectedRows();
Set<String> values = new TreeSet<String>();
Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected();
if (rows.length == 0 || sel.isEmpty()) return;
for (int row: rows) {
- String key = propertyData.getValueAt(row, 0).toString();
+ String key = tagData.getValueAt(row, 0).toString();
if (sel.isEmpty())
return;
for (OsmPrimitive p : sel) {
@@ -1220,14 +1212,14 @@ 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) {
@@ -1243,14 +1235,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 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 8106b85..7e57839 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
@@ -37,7 +37,6 @@ 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;
@@ -68,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;
@@ -82,7 +82,7 @@ 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
@@ -113,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;
}
@@ -121,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();
@@ -144,22 +144,22 @@ 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();
@@ -221,7 +221,7 @@ import org.openstreetmap.josm.tools.WindowGeometry;
}
}
- public class EditTagDialog extends AbstractTagsDialog {
+ public final class EditTagDialog extends AbstractTagsDialog {
final String key;
final Map<String, Integer> m;
final int row;
@@ -373,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 {
@@ -541,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;
}
@@ -621,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));
}
@@ -669,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;
@@ -722,7 +735,6 @@ import org.openstreetmap.josm.tools.WindowGeometry;
}
}
-
/**
* Read tags from comboboxes and add it to all selected objects
*/
@@ -747,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 5c9d69a..10a184f 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
@@ -427,8 +427,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;
@@ -520,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 34a6b63..5f654bb 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java
@@ -144,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 a3dfef1..e907261 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java
@@ -107,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 fdfc49a..a3979ec 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
@@ -56,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;
@@ -79,7 +78,6 @@ 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;
@@ -181,7 +179,7 @@ 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(
@@ -647,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(
@@ -768,7 +766,7 @@ 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>();
+ List<OsmPrimitive> ret = new ArrayList<OsmPrimitive>();
for (OsmPrimitive primitive : primitives) {
if (primitive instanceof Relation && getRelation() != null && getRelation().equals(primitive)) {
warnOfCircularReferences(primitive);
@@ -792,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();
}
@@ -820,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();
}
@@ -849,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();
}
@@ -886,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();
}
@@ -921,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();
}
@@ -1067,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);
@@ -1090,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);
@@ -1446,7 +1437,6 @@ 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);
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java
index d0e716e..c6209ae 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java
@@ -49,16 +49,6 @@ public class MemberRoleCellEditor extends AbstractCellEditor implements TableCel
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 816c5de..7caa7c6 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java
@@ -11,6 +11,7 @@ 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;
@@ -123,7 +124,7 @@ public class MemberTable extends OsmPrimitivesTable implements IMemberModelListe
public void valueChanged(ListSelectionEvent lse) {
if (Main.isDisplayingMapView()) {
Collection<RelationMember> sel = getMemberTableModel().getSelectedMembers();
- final ArrayList<OsmPrimitive> toHighlight = new ArrayList<OsmPrimitive>();
+ final List<OsmPrimitive> toHighlight = new ArrayList<OsmPrimitive>();
for (RelationMember r: sel) {
if (r.getMember().isUsable()) {
toHighlight.add(r.getMember());
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 171487b..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;
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 4db0229..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;
@@ -386,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);
@@ -401,7 +402,15 @@ public class MemberTableModel extends AbstractTableModel implements TableModelLi
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);
}
@@ -470,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));
}
@@ -654,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() {
@@ -756,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)));
@@ -769,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 03167f3..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;
}
/**
@@ -192,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 33487fd..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();
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java b/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java
index aad5872..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;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java b/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java
index 8f301ab..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
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 15fe390..5e43598 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java
@@ -158,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/SelectionTableCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java
index e5c01bf..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,7 +58,7 @@ 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));
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java b/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java
index dca4d29..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
@@ -51,7 +51,7 @@ public class SelectionTableModel extends AbstractTableModel implements Selection
@Override
public int getRowCount() {
- if (Main.map.mapView.getEditLayer() != layer)
+ if (Main.main.getEditLayer() != layer)
return 0;
return cache.size();
}
@@ -88,7 +88,7 @@ public class SelectionTableModel extends AbstractTableModel implements Selection
@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 10e2e4e..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;
@@ -130,6 +132,8 @@ public class ValidatorTreePanel extends JTree implements Destroyable {
valTreeModel.setRoot(rootNode);
return;
}
+ // Sort validation errors - #8517
+ Collections.sort(errors);
// Remember the currently expanded rows
Set<Object> oldSelectedRows = new HashSet<Object>();
@@ -210,7 +214,7 @@ public class ValidatorTreePanel extends JTree implements Destroyable {
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);
@@ -229,7 +233,7 @@ public class ValidatorTreePanel extends JTree implements Destroyable {
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())) {
@@ -242,9 +246,9 @@ public class ValidatorTreePanel extends JTree implements Destroyable {
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) {
diff --git a/src/org/openstreetmap/josm/gui/BookmarkList.java b/src/org/openstreetmap/josm/gui/download/BookmarkList.java
similarity index 66%
rename from src/org/openstreetmap/josm/gui/BookmarkList.java
rename to src/org/openstreetmap/josm/gui/download/BookmarkList.java
index 5b8b61a..ae6f3f1 100644
--- a/src/org/openstreetmap/josm/gui/BookmarkList.java
+++ b/src/org/openstreetmap/josm/gui/download/BookmarkList.java
@@ -1,5 +1,5 @@
-// 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;
@@ -14,6 +14,7 @@ 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;
@@ -32,20 +33,25 @@ 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);
@@ -53,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;
}
@@ -70,26 +83,73 @@ public class BookmarkList extends JList {
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());
@@ -101,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);
@@ -111,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);
@@ -125,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();
@@ -141,8 +201,8 @@ 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;
}
}
@@ -155,11 +215,13 @@ public class BookmarkList extends JList {
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>",
@@ -174,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);
@@ -216,10 +278,10 @@ 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();
diff --git a/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java b/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java
index 9f2833f..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;
@@ -22,10 +22,8 @@ import javax.swing.event.ListSelectionListener;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
-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;
@@ -153,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(","));
}
}
@@ -210,7 +208,6 @@ 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();
@@ -237,7 +234,6 @@ 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();
diff --git a/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java b/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
index 068bedd..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;
diff --git a/src/org/openstreetmap/josm/gui/download/DownloadDialog.java b/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
index 2a202c5..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());
@@ -293,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
*
*/
@@ -338,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);
}
@@ -351,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;
diff --git a/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java b/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java
index 1296b1e..6e92a0c 100644
--- a/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java
+++ b/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java
@@ -2,55 +2,30 @@
package org.openstreetmap.josm.gui.download;
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.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.Collections;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.Arrays;
+import java.util.Collection;
-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.KeyStroke;
-import javax.swing.border.EtchedBorder;
-import javax.swing.plaf.basic.BasicComboBoxEditor;
import org.openstreetmap.josm.Main;
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.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.tools.Utils;
-import org.openstreetmap.josm.gui.widgets.JosmTextField;
+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 ExtendedDialog implements WindowListener {
+public class DownloadObjectDialog extends OsmIdSelectionDialog {
- 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 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.
*/
@@ -63,153 +38,39 @@ public class DownloadObjectDialog extends ExtendedDialog implements WindowListen
* @param parent The parent component
*/
public DownloadObjectDialog(Component parent) {
- super(parent, tr("Download object"), new String[] {tr("Download object"), tr("Cancel")});
+ 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 void init() {
- GroupLayout layout = new GroupLayout(panel);
- 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));
-
+ 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));
-
- 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(fullRel)
- .addComponent(newLayer)
- .addComponent(help)
- );
cbType.addItemListener(new ItemListener() {
@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(fullRel)
- .addComponent(newLayer)
- .addComponent(help)
- );
+ return Arrays.<Component>asList(referrers, fullRel, newLayer);
}
- @Override
- public void setupDialog() {
-
- setContent(panel, false);
- setButtonIcons(new String[] {"download.png", "cancel.png"});
- setToolTipTexts(new String[] {
- tr("Start downloading"),
- tr("Close dialog and cancel downloading")
- });
- setDefaultButton(1);
- 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);
- }
-
- addWindowListener(this);
- super.setupDialog();
- }
-
- /**
- * 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());
- }
-
- 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);
- }
- }
- }
-
/**
* Determines if a new layer has been requested.
* @return true if a new layer has been requested, false otherwise
@@ -217,7 +78,7 @@ public class DownloadObjectDialog extends ExtendedDialog implements WindowListen
public final boolean isNewLayerRequested() {
return newLayer.isSelected();
}
-
+
/**
* Determines if relation members have been requested.
* @return true if relation members have been requested, false otherwise
@@ -225,7 +86,7 @@ public class DownloadObjectDialog extends ExtendedDialog implements WindowListen
public final boolean isFullRelationRequested() {
return fullRel.isSelected();
}
-
+
/**
* Determines if referrers have been requested.
* @return true if referrers have been requested, false otherwise
@@ -233,40 +94,14 @@ public class DownloadObjectDialog extends ExtendedDialog implements WindowListen
public final boolean isReferrersRequested() {
return referrers.isSelected();
}
-
- /**
- * 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 windowClosed(WindowEvent e) {
+ @Override
+ public void windowClosed(WindowEvent e) {
+ super.windowClosed(e);
if (e != null && e.getComponent() == this && getValue() == 1) {
- Main.pref.putInteger("downloadprimitive.lasttype", cbType.getSelectedIndex());
Main.pref.put("downloadprimitive.referrers", referrers.isSelected());
Main.pref.put("downloadprimitive.full", fullRel.isSelected());
Main.pref.put("download.newlayer", newLayer.isSelected());
-
- if (!tfId.readIds()) {
- JOptionPane.showMessageDialog(getParent(),
- tr("Invalid ID list specified\n"
- + "Cannot download object."),
- 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/download/DownloadSelection.java b/src/org/openstreetmap/josm/gui/download/DownloadSelection.java
index 27a3547..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;
diff --git a/src/org/openstreetmap/josm/gui/download/PlaceSelection.java b/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
index f3e56a4..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;
@@ -241,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) {
@@ -259,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--;
-
}
/**
@@ -388,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) {
diff --git a/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java b/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java
index 08f9b58..534e023 100644
--- a/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java
+++ b/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.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.download;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -21,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;
@@ -80,4 +79,14 @@ public class SlippyMapChooser extends JPanel implements DownloadSelection, Prope
repaint();
}
}
+
+ /**
+ * Refreshes the tile sources
+ * @since 6364
+ */
+ public final void refreshTileSources() {
+ if (pnlSlippyMapBBoxChooser != null) {
+ pnlSlippyMapBBoxChooser.refreshTileSources();
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/help/HelpBrowser.java b/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
index b611dda..1feb5e9 100644
--- a/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
+++ b/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
@@ -144,7 +144,7 @@ public class HelpBrowser extends JDialog {
css.append("\n");
}
} 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 {
@@ -470,7 +470,6 @@ 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"));
}
@@ -486,7 +485,6 @@ 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());
@@ -498,7 +496,6 @@ public class HelpBrowser extends JDialog {
}
@Override
public void update(Observable o, Object arg) {
- //System.out.println("BackAction: canGoBoack=" + history.canGoBack() );
setEnabled(history.canGoBack());
}
}
@@ -508,7 +505,6 @@ 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());
@@ -526,7 +522,6 @@ 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"));
}
@@ -558,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();
}
}
diff --git a/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java b/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java
index aa2c1fe..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).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
diff --git a/src/org/openstreetmap/josm/gui/help/HelpUtil.java b/src/org/openstreetmap/josm/gui/help/HelpUtil.java
index de2ce5a..2253793 100644
--- a/src/org/openstreetmap/josm/gui/help/HelpUtil.java
+++ b/src/org/openstreetmap/josm/gui/help/HelpUtil.java
@@ -15,15 +15,19 @@ 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);
}
/**
@@ -118,7 +122,7 @@ public class HelpUtil {
String ret = LanguageInfo.getWikiLanguagePrefix(type);
if(ret == null)
return ret;
- ret = "/" + ret + Main.pref.get("help.pathhelp", "/Help").replaceAll("^\\/+", ""); // remove leading /;
+ ret = "/" + ret + Main.pref.get("help.pathhelp", "/Help").replaceAll("^\\/+", ""); // remove leading /
return ret.replaceAll("\\/+", "\\/"); // collapse sequences of //
}
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/HistoryBrowserDialogManager.java b/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
index 65acd91..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();
@@ -137,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,
@@ -148,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);
}
@@ -160,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;
}
@@ -181,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
@@ -198,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 1a8d4d8..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;
@@ -102,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);
}
@@ -121,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
*/
@@ -185,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);
}
@@ -413,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() {
}
@@ -534,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;
}
@@ -552,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() {
@@ -672,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);
}
diff --git a/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java b/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
index 241a2fd..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,6 +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.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;
@@ -47,7 +52,7 @@ 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;
@@ -199,6 +204,11 @@ public class HistoryLoadTask extends PleaseWaitRunnable {
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 57%
copy from src/org/openstreetmap/josm/gui/history/TagInfoViewer.java
copy to src/org/openstreetmap/josm/gui/history/HistoryViewerPanel.java
index ae2358f..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 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>
- * <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/NodeListViewer.java b/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
index 0b7b72d..1c4be7a 100644
--- a/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
+++ b/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
@@ -28,6 +28,7 @@ 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;
@@ -205,9 +206,12 @@ public class NodeListViewer extends JPanel {
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");
+ }
}
}
@@ -216,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;
}
diff --git a/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java b/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java
index c851fbb..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;
@@ -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);
diff --git a/src/org/openstreetmap/josm/gui/history/RelationMemberListViewer.java b/src/org/openstreetmap/josm/gui/history/RelationMemberListViewer.java
index d9cb00d..e1065d5 100644
--- a/src/org/openstreetmap/josm/gui/history/RelationMemberListViewer.java
+++ b/src/org/openstreetmap/josm/gui/history/RelationMemberListViewer.java
@@ -1,19 +1,13 @@
// 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 org.openstreetmap.josm.data.osm.Relation} in a {@link org.openstreetmap.josm.data.osm.history.History}.
@@ -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/SelectionSynchronizer.java b/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java
index 84e2eda..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>();
}
diff --git a/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java b/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java
index ae2358f..d785ffc 100644
--- a/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java
+++ b/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java
@@ -1,12 +1,6 @@
// 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;
@@ -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/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 f6f6192..edd1294 100644
--- a/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
+++ b/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
@@ -15,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
@@ -38,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:")));
@@ -56,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;
@@ -66,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() {
@@ -74,23 +81,16 @@ 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 = "?";
@@ -140,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/io/AbstractUploadTask.java b/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java
index b5ba6a1..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);
}
}
diff --git a/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java b/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
index 063a9bf..a7d7212 100644
--- a/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
+++ b/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
@@ -36,44 +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() {
- @Override
- 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;
}
@@ -81,30 +78,39 @@ 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
@@ -124,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());
}
/**
@@ -150,16 +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/ChangesetManagementPanel.java b/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java
index 5a11086..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;
@@ -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);
@@ -304,7 +301,6 @@ 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"));
}
@@ -322,7 +318,6 @@ 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();
diff --git a/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java b/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java
index 1848534..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;
@@ -213,7 +214,7 @@ public class CloseChangesetDialog extends JDialog {
*/
public Collection<Changeset> getSelectedChangesets() {
Object [] sel = lstOpenChangesets.getSelectedValues();
- ArrayList<Changeset> ret = new ArrayList<Changeset>(sel.length);
+ 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 3f23533..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
diff --git a/src/org/openstreetmap/josm/gui/io/CredentialDialog.java b/src/org/openstreetmap/josm/gui/io/CredentialDialog.java
index 6f4e666..7774198 100644
--- a/src/org/openstreetmap/josm/gui/io/CredentialDialog.java
+++ b/src/org/openstreetmap/josm/gui/io/CredentialDialog.java
@@ -29,11 +29,11 @@ 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;
@@ -105,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();
}
diff --git a/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java b/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java
index 406c761..71dcf85 100644
--- a/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java
+++ b/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java
@@ -17,6 +17,7 @@ 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;
@@ -120,16 +121,16 @@ public class DownloadFileTask extends PleaseWaitRunnable{
}
Utils.close(out);
if (!canceled) {
- System.out.println(tr("Download finished"));
+ Main.info(tr("Download finished"));
if (unpack) {
- System.out.println(tr("Unpacking {0} into {1}", file.getAbsolutePath(), file.getParent()));
+ 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)
diff --git a/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java b/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
index 9a8a058..e5699a3 100644
--- a/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
+++ b/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
@@ -116,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/TagSettingsPanel.java b/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java
index 4286b3d..6e5a2b8 100644
--- a/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java
+++ b/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java
@@ -21,67 +21,74 @@ 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);
}
- 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.isEmpty()) {
- 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");
@@ -98,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() {
@@ -122,8 +129,8 @@ public class TagSettingsPanel extends JPanel implements TableModelListener {
/* -------------------------------------------------------------------------- */
@Override
public void tableChanged(TableModelEvent e) {
- String uploadComment = getUploadComment();
- changesetCommentModel.setComment(uploadComment);
+ changesetCommentModel.setComment(getTagEditorValue("comment"));
+ changesetSourceModel.setComment(getTagEditorValue("source"));
}
/**
@@ -132,16 +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 5460a75..9a9ef6f 100644
--- a/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java
+++ b/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java
@@ -90,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()) {
@@ -106,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);
}
}
}
@@ -115,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/UploadDialog.java b/src/org/openstreetmap/josm/gui/io/UploadDialog.java
index ffb1d11..6b16932 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadDialog.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadDialog.java
@@ -3,6 +3,7 @@ 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;
@@ -21,6 +22,7 @@ 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;
@@ -50,6 +52,7 @@ 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;
/**
@@ -96,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
@@ -127,13 +131,11 @@ public class UploadDialog extends JDialog implements PropertyChangeListener, Pre
}
};
- changesetCommentModel = new ChangesetCommentModel();
-
- tpConfigPanels.add(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.add(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"));
@@ -224,7 +226,7 @@ public class UploadDialog extends JDialog implements PropertyChangeListener, Pre
}
);
- pnlBasicUploadSettings.setUploadCommentDownFocusTraversalHandler(
+ pnlBasicUploadSettings.setUploadTagDownFocusTraversalHandlers(
new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
@@ -297,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;
}
@@ -311,9 +313,9 @@ 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());
}
}
}
@@ -339,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
@@ -399,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"),
@@ -426,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;
@@ -444,14 +477,40 @@ 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) {
@@ -495,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();
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/UploadPrimitivesTask.java b/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
index 4f0038f..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);
@@ -298,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;
}
@@ -327,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 9e4f865..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;
@@ -250,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;
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 c0b661a..df8082e 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
@@ -29,9 +29,9 @@ 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;
/**
@@ -50,8 +50,6 @@ 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;
@@ -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>();
@@ -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;
diff --git a/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java b/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java
index 44e173a..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;
diff --git a/src/org/openstreetmap/josm/gui/layer/GpxLayer.java b/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
index 9c16690..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;
@@ -133,7 +134,6 @@ public class GpxLayer extends Layer {
}
}
}
- //System.out.println("scanning "+data.tracks.size()+" tracks, found min,max"+min+"--"+max);
if (min==1e100 || max==-1e100) return null;
return new Date[]{new Date((long) (min * 1000)), new Date((long) (max * 1000)), };
}
@@ -242,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;
}
@@ -423,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();
@@ -488,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;
}
}
}
@@ -543,72 +539,70 @@ public class GpxLayer extends Layer {
}
}
- 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:
- 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;
+ 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;
@@ -616,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())
@@ -799,8 +786,6 @@ public class GpxLayer extends Layer {
{
g.setStroke(storedStroke);
}
- // Long duration = System.currentTimeMillis() - startTime;
- // System.out.println(duration);
} // end paint
@Override
@@ -828,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;
}
diff --git a/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java b/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
index 7bb2a38..d524584 100644
--- a/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
@@ -38,6 +38,7 @@ 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.gui.widgets.UrlLabel;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.UrlLabel;
@@ -82,7 +83,7 @@ public abstract class ImageryLayer extends Layer {
}
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);
}
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/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 efc81aa..e2d1d5a 100644
--- a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
@@ -98,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;
@@ -382,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);
@@ -395,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");
}
@@ -407,7 +410,7 @@ 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();
}
// warn about new conflicts
@@ -501,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(),
diff --git a/src/org/openstreetmap/josm/gui/layer/TMSLayer.java b/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
index 51d7762..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;
@@ -114,6 +115,7 @@ 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);
}
@@ -138,6 +140,7 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
loader.headers.put("User-Agent", Version.getInstance().getFullAgentString());
return loader;
} catch (IOException e) {
+ Main.warn(e);
}
}
return null;
@@ -145,13 +148,14 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
};
/**
- * Plugins that wish to set custom tile loader should call this method
- */
+ * Plugins that wish to set custom tile loader should call this method
+ */
public static void setCustomTileLoaderFactory(TileLoaderFactory loaderFactory) {
TMSLayer.loaderFactory = loaderFactory;
}
- HashSet<Tile> tileRequestsOutstanding = new HashSet<Tile>();
+ private Set<Tile> tileRequestsOutstanding = new HashSet<Tile>();
+
@Override
public synchronized void tileLoadingFinished(Tile tile, boolean success) {
if (tile.hasError()) {
@@ -328,7 +332,7 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
UTFInputStreamReader in = UTFInputStreamReader.create(Utils.openURL(u), "utf-8");
String r = new Scanner(in).useDelimiter("\\A").next();
Utils.close(in);
- System.out.println("Successfully loaded Bing attribution data.");
+ Main.info("Successfully loaded Bing attribution data.");
return r.getBytes("utf-8");
}
}
@@ -346,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;
}
@@ -434,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());
diff --git a/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java b/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java
index 3b90f73..d3dfc7d 100644
--- a/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java
@@ -155,7 +155,7 @@ public class ValidatorLayer extends Layer implements LayerChangeListener {
*/
@Override
public void layerRemoved(Layer oldLayer) {
- if (oldLayer instanceof OsmDataLayer && Main.map != null && Main.map.mapView.getEditLayer() == null) {
+ if (oldLayer instanceof OsmDataLayer && Main.isDisplayingMapView() && !Main.main.hasEditLayer()) {
Main.main.removeLayer(this);
} else if (oldLayer == this) {
MapView.removeLayerChangeListener(this);
diff --git a/src/org/openstreetmap/josm/gui/layer/WMSLayer.java b/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
index 9fb72ad..8af1347 100644
--- a/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
@@ -110,6 +110,7 @@ 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 double resolution;
@@ -121,9 +122,9 @@ 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 = true;
+ protected boolean autoResolutionEnabled = PROP_DEFAULT_AUTOZOOM.get();
protected boolean settingsChanged;
public WmsCache cache;
private AttributionSupport attribution = new AttributionSupport();
@@ -147,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 */
@@ -568,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 {
@@ -608,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();
}
}
@@ -740,18 +736,17 @@ public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceC
}
}
-
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, false);
@@ -786,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) {
@@ -935,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");
}
}
}
@@ -957,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();
}
@@ -976,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 (
@@ -1030,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 b2e6c1d..d098219 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,10 +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.List;
import java.util.TimeZone;
-import java.util.Vector;
import java.util.zip.GZIPInputStream;
import javax.swing.AbstractAction;
@@ -72,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;
@@ -80,7 +78,8 @@ import org.openstreetmap.josm.tools.PrimaryDateParser;
import org.xml.sax.SAXException;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
-/** 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 {
@@ -114,7 +113,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
}
ExtendedDialog syncDialog;
- Vector<GpxDataWrapper> gpxLst = new Vector<GpxDataWrapper>();
+ List<GpxDataWrapper> gpxLst = new ArrayList<GpxDataWrapper>();
JPanel outerPanel;
JosmComboBox cbGpx;
JosmTextField tfTimezone;
@@ -290,7 +289,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
panelTf.add(new JLabel(tr("I am in the timezone of: ")), gc);
String[] tmp = TimeZone.getAvailableIDs();
- Vector<String> vtTimezones = new Vector<String>(tmp.length);
+ List<String> vtTimezones = new ArrayList<String>(tmp.length);
for (String tzStr : tmp) {
TimeZone tz = TimeZone.getTimeZone(tzStr);
@@ -303,7 +302,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;
@@ -349,6 +348,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
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();
@@ -382,6 +382,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
try {
orientation = ExifReader.readOrientation(sel);
} catch (Exception e) {
+ Main.warn(e);
}
imgDisp.setImage(sel, orientation);
@@ -389,6 +390,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));
@@ -474,7 +476,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);
}
@@ -540,14 +542,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();
@@ -816,7 +810,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();
@@ -880,7 +874,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"));
@@ -902,7 +896,7 @@ 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
@@ -968,12 +962,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.
@@ -994,7 +988,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
return;
GpxData gpx = gpxW.data;
- ArrayList<ImageEntry> imgs = getSortedImgList();
+ List<ImageEntry> imgs = getSortedImgList();
PrimaryDateParser dateParser = new PrimaryDateParser();
// no images found, exit
@@ -1051,15 +1045,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);
@@ -1075,7 +1060,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
}
}
- private ArrayList<ImageEntry> getSortedImgList() {
+ private List<ImageEntry> getSortedImgList() {
return getSortedImgList(cbExifImg.isSelected(), cbTaggedImg.isSelected());
}
@@ -1086,10 +1071,10 @@ public class CorrelateGpxWithImages extends AbstractAction {
* @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;
}
@@ -1135,7 +1120,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();
@@ -1159,7 +1144,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;
@@ -1174,7 +1159,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
@@ -1190,7 +1187,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());
@@ -1198,32 +1194,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--;
@@ -1243,9 +1236,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);
@@ -1253,6 +1245,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++;
}
@@ -1261,7 +1254,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 403f6bf..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() {
@@ -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);
+ }
- super(tr("Geotagged Images"));
+ /**
+ * 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);
+ }
+
+ /**
+ * 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
@@ -397,6 +439,10 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
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() {
@@ -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();
@@ -765,7 +919,7 @@ 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);
@@ -843,6 +997,10 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
return copy;
}
+ /**
+ * Returns the associated GPX layer.
+ * @return The associated GPX layer
+ */
public GpxLayer getGpxLayer() {
return gpxLayer;
}
@@ -856,4 +1014,26 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
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 8b82686..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;
@@ -81,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());
}
}
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java
index a79719a..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;
@@ -188,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 9821209..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);
@@ -177,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();
@@ -217,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());
@@ -232,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) {
@@ -244,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())));
}
@@ -312,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 75cd6c6..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;
@@ -36,7 +35,7 @@ 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;
@@ -52,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) {
@@ -70,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;
}
}
@@ -81,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(
@@ -93,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;
}
@@ -111,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 80a9868..07a632c 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java
@@ -46,6 +46,10 @@ public class ChooseTrackVisibilityAction extends AbstractAction {
DateFilterPanel dateFilter;
JTable table;
+ /**
+ * 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;
@@ -155,7 +159,7 @@ public class ChooseTrackVisibilityAction extends AbstractAction {
}
private void updateVisibilityFromTable() {
- ListSelectionModel s = (ListSelectionModel) table.getSelectionModel();
+ ListSelectionModel s = table.getSelectionModel();
for (int i = 0; i < layer.trackVisibility.length; i++) {
layer.trackVisibility[table.convertRowIndexToModel(i)] = s.isSelectedIndex(i);
}
@@ -216,9 +220,7 @@ public class ChooseTrackVisibilityAction extends AbstractAction {
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;
}
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
index aa3b4c1..7f2bdcd 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
@@ -24,10 +24,10 @@ import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
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;
public class ConvertToDataLayerAction extends AbstractAction {
private final GpxLayer layer;
@@ -42,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;
}
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java
index 2ec2486..79b85b7 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java
@@ -69,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");
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
index d9ae12a..c4dcf2b 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
@@ -130,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;
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java
index a03f5df..396e2d9 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java
@@ -7,6 +7,7 @@ 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;
@@ -34,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());
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 06be74d..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;
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
index b1493b8..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;
@@ -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 1fc509c..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;
@@ -113,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;
@@ -273,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;
}
@@ -422,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) {
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 5cb8b5d..864b5f0 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
@@ -33,12 +33,10 @@ import org.openstreetmap.josm.tools.AudioPlayer;
* @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;
@@ -275,7 +273,7 @@ public class PlayHeadMarker extends Marker {
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);
}
/**
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/Cascade.java b/src/org/openstreetmap/josm/gui/mappaint/Cascade.java
index 30a2ae5..0a9107a 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/Cascade.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/Cascade.java
@@ -10,13 +10,14 @@ 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.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();
@@ -48,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
@@ -119,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;
@@ -146,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));
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 2b99d7b..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>();
}
@@ -112,7 +114,14 @@ public class ElemStyles {
}
}
StyleCache style = osm.mappaintStyle != null ? osm.mappaintStyle : StyleCache.EMPTY_STYLECACHE;
- osm.mappaintStyle = style.put(p.a, p.b);
+ 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;
}
@@ -235,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()) {
@@ -439,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 4af2ec6..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,46 +70,120 @@ 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 instanceof Relation;
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java b/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java
index 197cf12..2f75921 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java
@@ -7,6 +7,7 @@ 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;
@@ -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/MapImage.java b/src/org/openstreetmap/josm/gui/mappaint/MapImage.java
index 70e8399..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);
}
@@ -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 2f4493e..9dcef23 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java
@@ -13,7 +13,6 @@ 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;
@@ -64,7 +63,7 @@ public class MapPaintMenu extends JMenu implements MapPaintSylesUpdateListener {
@Override
public void updateEnabledState() {
- setEnabled(Main.isDisplayingMapView() && (Main.main.getEditLayer() != null || mapHasGpxorMarkerLayer()));
+ setEnabled(Main.isDisplayingMapView() && (Main.main.hasEditLayer() || mapHasGpxorMarkerLayer()));
}
private boolean mapHasGpxorMarkerLayer() {
@@ -77,12 +76,6 @@ public class MapPaintMenu extends JMenu implements MapPaintSylesUpdateListener {
}
}
private final Map<String, MapPaintAction> actions = new HashMap<String, MapPaintAction>();
- private final LaunchMapPaintPreferencesAction mapPaintPreferencesAction = new MapPaintDialog.LaunchMapPaintPreferencesAction() {
-
- {
- putValue("toolbar", "mappaintpreference");
- }
- };
/**
* Constructs a new {@code MapPaintMenu}
@@ -109,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 d4917f6..a718c89 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
@@ -5,7 +5,6 @@ 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;
@@ -38,14 +37,17 @@ import org.openstreetmap.josm.tools.Utils;
*
* 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,6 +122,7 @@ public class MapPaintStyles {
.setDirs(getIconSourceDirs(source))
.setId("mappaint."+source.getPrefName())
.setArchive(source.zipIcons)
+ .setInArchiveDir(source.getZipEntryDirName())
.setOptional(true).get();
}
@@ -138,7 +141,7 @@ public class MapPaintStyles {
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
}
@@ -210,11 +213,14 @@ public class MapPaintStyles {
MirroredInputStream in = null;
try {
in = new MirroredInputStream(entry.url);
- InputStream 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);
- zip = in.getZipEntry("xml", "style");
- if (zip != null)
+ }
+ zipEntryPath = in.findZipEntryPath("xml", "style");
+ if (zipEntryPath != null)
return new XmlStyleSource(entry);
if (entry.url.toLowerCase().endsWith(".mapcss"))
return new MapCSSStyleSource(entry);
@@ -222,27 +228,31 @@ public class MapPaintStyles {
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 {
Utils.close(in);
diff --git a/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java b/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java
index 1ce98a5..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;
@@ -24,8 +25,14 @@ import org.openstreetmap.josm.tools.Utils;
* applies for Nodes and turn restriction relations
*/
public class NodeElemStyle extends ElemStyle implements StyleKeys {
- public MapImage mapImage;
- public Symbol symbol;
+ 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 implements StyleKeys {
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();
}
@@ -234,8 +241,21 @@ public class NodeElemStyle extends ElemStyle implements StyleKeys {
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/StyleCache.java b/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java
index 982d167..e3fe172 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java
@@ -13,16 +13,16 @@ 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)
@@ -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");
diff --git a/src/org/openstreetmap/josm/gui/mappaint/StyleKeys.java b/src/org/openstreetmap/josm/gui/mappaint/StyleKeys.java
index 53f885f..ee706ab 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/StyleKeys.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/StyleKeys.java
@@ -31,6 +31,4 @@ public interface StyleKeys {
int ICON_WIDTH_IDX = 1;
int ICON_HEIGHT_IDX = 2;
int ICON_OPACITY_IDX = 3;
- String[] ICON_KEYS = {"icon-image", "icon-width", "icon-height", "icon-opacity"};
- String[] REPEAT_IMAGE_KEYS = {"repeat-image", "repeat-image-width", "repeat-image-height", "repeat-image-opacity"};
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java b/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java
index 33aae46..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 {
@@ -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/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 59e5d38..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) {
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/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/MapCSSStyleSource.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
index 80e8d30..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);
@@ -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 b12a912..52ac91a 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
@@ -4,6 +4,7 @@ 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.Relation;
@@ -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;
@@ -223,7 +224,7 @@ public interface Selector {
try {
if (!c.applies(env)) return false;
} catch (PatternSyntaxException e) {
- System.err.println("PatternSyntaxException while applying condition" + c +": "+e.getMessage());
+ Main.error("PatternSyntaxException while applying condition" + c +": "+e.getMessage());
return false;
}
}
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 d95020d..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);
@@ -67,24 +68,28 @@ 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);
}
@@ -93,7 +98,7 @@ public class XmlStyleSource extends StyleSource implements StyleKeys {
@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;
@@ -322,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 8f4877c..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,8 +48,7 @@ public class XmlStyleSourceHandler extends DefaultHandler
rule.init();
}
- Color convertColor(String colString)
- {
+ Color convertColor(String colString) {
int i = colString.indexOf('#');
Color ret;
if (i < 0) {
@@ -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/FullyAutomaticAuthorizationUI.java b/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
index 570c5e5..74cb15d 100644
--- a/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
+++ b/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
@@ -30,13 +30,13 @@ 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;
@@ -386,7 +386,6 @@ 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"));
}
diff --git a/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java b/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java
index 9624a62..d92a16b 100644
--- a/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java
+++ b/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java
@@ -8,7 +8,6 @@ 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.text.JTextComponent;
@@ -22,12 +21,6 @@ public class FullyAutomaticPropertiesPanel extends JPanel {
private JosmTextField tfUserName;
private JosmPasswordField tfPassword;
- private UserNameValidator valUserName;
-
- private JCheckBox cbWriteMapData;
- private JCheckBox cbWriteGpsTraces;
- private JCheckBox cbReadGpsTraces;
-
protected JPanel buildUserNamePasswordPanel() {
JPanel pnl = new JPanel(new GridBagLayout());
@@ -43,7 +36,7 @@ public class FullyAutomaticPropertiesPanel extends JPanel {
gc.weightx = 1.0;
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/OAuthAuthorizationWizard.java b/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java
index a791041..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;
@@ -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/")
diff --git a/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java b/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
index 9b81b5f..911b1a1 100644
--- a/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
+++ b/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
@@ -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;
}
diff --git a/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java b/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java
index 60d2c52..cf75879 100644
--- a/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java
+++ b/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java
@@ -23,10 +23,10 @@ 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;
diff --git a/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java b/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java
index 3af75ef..ad26902 100644
--- a/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java
+++ b/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java
@@ -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 dc7c858..88b0b98 100644
--- a/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java
@@ -11,6 +11,7 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
@@ -26,7 +27,7 @@ import org.openstreetmap.josm.gui.widgets.JosmTextField;
* audio.toolbar ??
*/
-public class AudioPreference extends DefaultTabPreferenceSetting {
+public final class AudioPreference extends DefaultTabPreferenceSetting {
public static class Factory implements PreferenceSettingFactory {
@Override
diff --git a/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java b/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java
index e633dac..ac7ffe2 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;
@@ -44,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,7 +54,7 @@ import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
-public class PluginPreference extends DefaultTabPreferenceSetting {
+public final class PluginPreference extends DefaultTabPreferenceSetting {
public static class Factory implements PreferenceSettingFactory {
@Override
public PreferenceSetting createPreferenceSetting() {
@@ -346,7 +347,7 @@ public class PluginPreference extends DefaultTabPreferenceSetting {
JOptionPane.INFORMATION_MESSAGE,
null // FIXME: provide help context
);
- };
+ }
});
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java b/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
index 1b456f9..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;
@@ -185,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 059a54e..89ffe75 100644
--- a/src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java
+++ b/src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.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/PreferenceTabbedPane.java b/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
index c076522..fb700b4 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;
@@ -30,6 +30,7 @@ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.ExpertToggleAction;
import org.openstreetmap.josm.actions.RestartAction;
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;
@@ -58,7 +59,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.
@@ -77,7 +79,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) {
@@ -107,7 +109,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) {
@@ -116,8 +118,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
@@ -200,7 +201,7 @@ public class PreferenceTabbedPane extends JTabbedPane implements MouseWheelListe
selectTabBy(new TabIdentifier(){
@Override
public boolean identify(TabPreferenceSetting tps, Object name) {
- return name != null && tps != null && tps.getIconName() != null && tps.getIconName().equals(name);
+ return name != null && tps != null && tps.getIconName() != null && name.equals(tps.getIconName());
}}, name);
}
@@ -418,7 +419,9 @@ public class PreferenceTabbedPane extends JTabbedPane implements MouseWheelListe
if (sel != null) {
setSelectedComponent(sel);
}
- } catch (IllegalArgumentException e) {}
+ } catch (IllegalArgumentException e) {
+ Main.warn(e);
+ }
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java b/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java
index 76a2788..145fed0 100644
--- a/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java
@@ -31,7 +31,7 @@ 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
diff --git a/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java b/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java
index a2d1a46..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,7 +17,8 @@ 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
@@ -37,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}
diff --git a/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java b/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
index 09983e9..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;
@@ -423,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) {
@@ -464,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));
@@ -997,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) {
@@ -1246,7 +1246,7 @@ public abstract class SourceEditor extends JPanel {
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) {
@@ -1290,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));
}
}
}
@@ -1499,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();
diff --git a/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java b/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java
index e0e223f..3b06e78 100644
--- a/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java
+++ b/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java
@@ -1,11 +1,13 @@
// 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,
@@ -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;
@@ -61,6 +82,8 @@ public class SourceEntry {
return false;
final SourceEntry other = (SourceEntry) obj;
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 b81f66b..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;
@@ -474,7 +474,7 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
private DefaultMutableTreeNode rootActionsNode = new DefaultMutableTreeNode(tr("Actions"));
public JToolBar control = new JToolBar();
- private HashMap<Object, ActionDefinition> buttonActions = new HashMap<Object, ActionDefinition>(30);
+ private Map<Object, ActionDefinition> buttonActions = new HashMap<Object, ActionDefinition>(30);
@Override
public PreferenceSetting createPreferenceSetting() {
@@ -823,8 +823,8 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
}
@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
@@ -903,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;
@@ -916,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);
@@ -987,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);
}
}
}
@@ -1000,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()));
}
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java b/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java
index d1e1354..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
diff --git a/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java b/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java
index 583109f..d1a1e5c 100644
--- a/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.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.advanced;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -18,6 +18,7 @@ import java.util.Map;
import java.util.Map.Entry;
import javax.swing.AbstractAction;
+import javax.swing.AbstractAction;
import javax.swing.Box;
import javax.swing.JButton;
import javax.swing.JFileChooser;
@@ -47,7 +48,7 @@ import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.tools.GBC;
-public class AdvancedPreference extends DefaultTabPreferenceSetting {
+public final class AdvancedPreference extends DefaultTabPreferenceSetting {
public static class Factory implements PreferenceSettingFactory {
@Override
@@ -199,7 +200,7 @@ public class AdvancedPreference extends DefaultTabPreferenceSetting {
}
private void exportSelectedToXML() {
- ArrayList<String> keys = new ArrayList<String>();
+ List<String> keys = new ArrayList<String>();
boolean hasLists = false;
for (PrefEntry p: table.getSelectedItems()) {
@@ -245,7 +246,6 @@ public class AdvancedPreference extends DefaultTabPreferenceSetting {
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/>");
@@ -253,9 +253,6 @@ public class AdvancedPreference extends DefaultTabPreferenceSetting {
+ "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(allData, customComparator);
@@ -331,7 +328,11 @@ public class AdvancedPreference extends DefaultTabPreferenceSetting {
"Are you sure you want to continue?")
+"</html>", null, "")) {
Main.pref.resetToDefault();
- try { Main.pref.save(); } catch (IOException ex) {}
+ try {
+ Main.pref.save();
+ } catch (IOException e) {
+ Main.warn("IOException while saving preferences: "+e.getMessage());
+ }
readPreferences(Main.pref);
applyFilter();
}
@@ -351,9 +352,9 @@ public class AdvancedPreference extends DefaultTabPreferenceSetting {
int idx = s.indexOf('_');
if (idx>=0) {
String t=s.substring(0,idx);
- System.out.println(t);
- if (profileTypes.containsKey(t))
+ if (profileTypes.containsKey(t)) {
p.add(new ImportProfileAction(s, f, t));
+ }
}
}
for (File f: Main.pref.getPreferencesDirFile().listFiles()) {
@@ -361,8 +362,9 @@ public class AdvancedPreference extends DefaultTabPreferenceSetting {
int idx = s.indexOf('_');
if (idx>=0) {
String t=s.substring(0,idx);
- if (profileTypes.containsKey(t))
+ if (profileTypes.containsKey(t)) {
p.add(new ImportProfileAction(s, f, t));
+ }
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileAction.java b/src/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileAction.java
index fd5dd47..659c0ef 100644
--- a/src/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileAction.java
+++ b/src/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileAction.java
@@ -1,22 +1,25 @@
// 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;
-import static org.openstreetmap.josm.tools.I18n.tr;
-
/**
* Action that exports some fragment of settings to custom configuration file
*/
@@ -34,7 +37,7 @@ public class ExportProfileAction extends AbstractAction {
@Override
public void actionPerformed(ActionEvent ae) {
- ArrayList<String> keys = new ArrayList<String>();
+ List<String> keys = new ArrayList<String>();
Map<String, Setting> all = prefs.getAllSettings();
for (String key: all.keySet()) {
if (key.matches(prefPattern)) {
@@ -69,8 +72,7 @@ public class ExportProfileAction extends AbstractAction {
File sel = fc.getSelectedFile();
if (!sel.getName().endsWith(".xml")) sel=new File(sel.getAbsolutePath()+".xml");
if (!sel.getName().startsWith(schemaKey)) {
- System.out.println(sel.getParentFile().getAbsolutePath()+"/"+schemaKey+"_"+sel.getName());
- sel =new File(sel.getParentFile().getAbsolutePath()+"/"+schemaKey+"_"+sel.getName());
+ sel = new File(sel.getParentFile().getAbsolutePath()+"/"+schemaKey+"_"+sel.getName());
}
return sel;
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java b/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java
index a055cd6..da5c715 100644
--- a/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java
+++ b/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java
@@ -20,6 +20,8 @@ import org.openstreetmap.josm.data.Preferences.ListSetting;
import org.openstreetmap.josm.gui.ExtendedDialog;
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 {
@@ -27,6 +29,9 @@ public class ListEditor extends ExtendedDialog {
List<String> data;
PrefEntry entry;
+ /**
+ * 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;
@@ -41,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() {
@@ -100,5 +114,4 @@ public class ListEditor extends ExtendedDialog {
return true;
}
}
-
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java b/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java
index 6478b1f..90e4700 100644
--- a/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java
+++ b/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java
@@ -116,7 +116,7 @@ public class PreferencesTable extends JTable {
if (llEditor.getValue() == 1) {
List<List<String>> data = llEditor.getData();
@SuppressWarnings("unchecked")
- Collection<Collection<String>> stgValue = (Collection) stg.getValue();
+ Collection<Collection<String>> stgValue = (Collection<Collection<String>>) stg.getValue();
if (!Preferences.equalArray(stgValue, data)) {
e.setValue(new Preferences.ListListSetting(data));
return true;
@@ -297,7 +297,7 @@ public class PreferencesTable extends JTable {
new Color(200,255,200));
private Color foregroundColor = Main.pref.getUIColor("Table.foreground");
private Color nonDefaultColor = Main.pref.getColor(
- marktr("Advanced Background: NonDefalut"),
+ marktr("Advanced Background: NonDefault"),
new Color(255,255,200));
@Override
diff --git a/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java b/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java
index ab97158..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;
@@ -59,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;
diff --git a/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java b/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java
index fd1e221..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,7 +11,7 @@ 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() {
diff --git a/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java b/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java
index 7577dc1..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;
@@ -40,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"));
@@ -50,7 +51,6 @@ public class DrawingPreference implements SubPreferenceSetting {
@Override
public void addGui(PreferenceTabbedPane gui) {
- //gui.display.setPreferredSize(new Dimension(400,600));
gpxPanel = new GPXSettingsPanel();
gui.addValidationListener(gpxPanel);
JPanel panel = gpxPanel;
@@ -117,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")),
@@ -144,12 +148,14 @@ public class DrawingPreference implements SubPreferenceSetting {
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);
@@ -171,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 316cd98..bfe8897 100644
--- a/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
@@ -51,7 +51,6 @@ public class GPXSettingsPanel extends JPanel implements ValidationListener {
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)"));
@@ -206,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);
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java b/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java
index 4a7ce63..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;
@@ -61,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());
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java b/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java
index f327590..a35c22c 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java
@@ -21,6 +21,7 @@ import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JScrollPane;
+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;
@@ -82,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());
}
}
});
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java b/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
index cca3108..cd4ea41 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
@@ -56,6 +56,7 @@ 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;
@@ -65,7 +66,7 @@ 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() {
@@ -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);
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 9d72437..90442f4 100644
--- a/src/org/openstreetmap/josm/gui/preferences/map/BackupPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/map/BackupPreference.java
@@ -22,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;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
@@ -35,6 +36,7 @@ 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 JosmTextField autosaveInterval = new JosmTextField(8);
@@ -83,6 +85,13 @@ 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) {
@@ -112,6 +121,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 49b83ca..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,7 +40,7 @@ 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;
@@ -85,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
@@ -169,8 +169,7 @@ public class MapPaintPreference implements SubPreferenceSetting {
if (reload) {
MapPaintStyles.readFromPreferences();
}
- if (Main.isDisplayingMapView())
- {
+ if (Main.isDisplayingMapView()) {
MapPaintStyles.getStyles().clearCached();
}
return false;
@@ -185,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
diff --git a/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java b/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java
index 5a20fcd..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,7 +11,7 @@ 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() {
diff --git a/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java b/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java
index c2def09..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;
@@ -45,7 +45,7 @@ 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
@@ -83,7 +83,7 @@ public class TaggingPresetPreference implements SubPreferenceSetting {
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));
@@ -107,7 +107,7 @@ public class TaggingPresetPreference implements SubPreferenceSetting {
} 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) {
@@ -134,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);
@@ -186,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
@@ -282,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
diff --git a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java
index fa34298..5f6d82a 100644
--- a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java
@@ -150,7 +150,7 @@ public class PluginListPanel extends VerticallyScrollablePanel{
}
}
}
- };
+ }
/**
diff --git a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java
index fe8e632..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));
diff --git a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java
index b62f6d7..601ed1c 100644
--- a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java
@@ -18,7 +18,7 @@ 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;
@@ -54,8 +54,6 @@ public class PluginUpdatePolicyPanel extends JPanel {
}
}
- private ButtonGroup bgVersionBasedUpdatePolicy;
- private ButtonGroup bgTimeBasedUpdatePolicy;
private Map<Policy, JRadioButton> rbVersionBasedUpatePolicy;
private Map<Policy, JRadioButton> rbTimeBasedUpatePolicy;
private JosmTextField tfUpdateInterval;
@@ -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);
@@ -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();
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java
index 5b6ee0c..8cb27c4 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java
@@ -35,6 +35,9 @@ public class CodeProjectionChoice extends AbstractProjectionChoice implements Su
String code;
+ /**
+ * Constructs a new {@code CodeProjectionChoice}.
+ */
public CodeProjectionChoice() {
super(tr("By Code (EPSG)"), "core:code");
}
@@ -46,7 +49,7 @@ public class CodeProjectionChoice extends AbstractProjectionChoice implements Su
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())
@@ -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 e509bf0..e6325cb 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
@@ -41,6 +41,9 @@ public class CustomProjectionChoice extends AbstractProjectionChoice implements
private String pref;
+ /**
+ * Constructs a new {@code CustomProjectionChoice}.
+ */
public CustomProjectionChoice() {
super(tr("Custom Projection"), "core:custom");
}
@@ -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());
@@ -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 04ef581..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);
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java
index f20cf50..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"));
}
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/ProjectionPreference.java b/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java
index 7f0b59d..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,7 +43,7 @@ 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.
@@ -174,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.
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 883a484..0d5021d 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java
@@ -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,7 +109,7 @@ 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)));
@@ -132,7 +138,7 @@ public class UTMProjectionChoice extends ListProjectionChoice {
super.setPreferences(args);
Hemisphere hemisphere = DEFAULT_HEMISPHERE;
- if(args != null) {
+ if (args != null) {
String[] array = args.toArray(new String[args.size()]);
if (array.length > 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/AuthenticationPreferencesPanel.java b/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
index f73cab2..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,6 +149,8 @@ public class AuthenticationPreferencesPanel extends VerticallyScrollablePanel im
pnlBasicAuthPreferences.saveToPreferences();
pnlOAuthPreferences.saveToPreferences();
}
+ // save message notifications preferences. To be done after authentication preferences.
+ pnlMessagesPreferences.saveToPreferences();
}
/**
diff --git a/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java b/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java
index 40725a1..8298d5a 100644
--- a/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java
@@ -14,6 +14,7 @@ import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.JPanel;
+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;
@@ -31,7 +32,6 @@ public class BasicAuthenticationPreferencesPanel extends JPanel {
/** the OSM user name */
private JosmTextField tfOsmUserName;
- private UserNameValidator valUserName;
/** the OSM password */
private JosmPasswordField tfOsmPassword;
/** a panel with further information, e.g. some warnings */
@@ -56,7 +56,7 @@ public class BasicAuthenticationPreferencesPanel extends JPanel {
gc.weightx = 1.0;
add(tfOsmUserName = new JosmTextField(), gc);
SelectAllOnFocusGainedDecorator.decorate(tfOsmUserName);
- valUserName = new UserNameValidator(tfOsmUserName);
+ UserNameValidator valUserName = new UserNameValidator(tfOsmUserName);
valUserName.validate();
// -- OSM password
@@ -102,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("");
}
@@ -117,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 c64c244..b1e2b87 100644
--- a/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
@@ -25,13 +25,13 @@ import javax.swing.JPanel;
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;
/**
diff --git a/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java b/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
index 06a5622..2080500 100644
--- a/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
@@ -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);
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java b/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java
index 7248e14..778392a 100644
--- a/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java
@@ -24,8 +24,8 @@ import javax.swing.JPanel;
import javax.swing.JRadioButton;
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;
@@ -71,7 +71,6 @@ 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 JosmTextField tfProxyHttpHost;
private JosmTextField tfProxyHttpPort;
@@ -208,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()) {
@@ -315,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 8e3e1d3..cc8fed3 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;
@@ -37,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;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
@@ -56,40 +57,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 +83,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();
@@ -140,7 +106,6 @@ public class PrefJPanel extends JPanel {
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();
@@ -374,7 +339,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));
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java b/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java
index f564946..355835e 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,7 +15,9 @@ 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;
private String defaultFilter;
@@ -40,7 +42,7 @@ public class ShortcutPreference extends DefaultTabPreferenceSetting {
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);
}
@@ -55,11 +57,11 @@ public class ShortcutPreference extends DefaultTabPreferenceSetting {
}
// 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
diff --git a/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java b/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java
index 2a88f98..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();
diff --git a/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java b/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
index cb4e065..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;
@@ -34,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;
@@ -368,9 +369,8 @@ public class TagEditorModel extends AbstractTableModel {
*/
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();
@@ -409,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);
}
@@ -419,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.
@@ -430,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().isEmpty() || tag.getValue().trim().isEmpty()) {
+ if (!keepEmpty && (tag.getName().trim().isEmpty() || tag.getValue().trim().isEmpty())) {
continue;
}
tags.put(tag.getName().trim(), tag.getValue().trim());
@@ -438,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;
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java b/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java
index 1fb401d..011f26c 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java
@@ -42,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
@@ -184,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);
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 8b9e16c..992fed5 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TagTable.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TagTable.java
@@ -14,9 +14,9 @@ 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.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -37,15 +37,21 @@ 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.PasteTagsAction.TagPaster;
+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.
@@ -328,10 +334,30 @@ public class TagTable extends JTable {
public void run() {
Relation relation = new Relation();
model.applyToPrimitive(relation);
- TagPaster tagPaster = new TagPaster(Main.pasteBuffer.getDirectlyAdded(), Collections.<OsmPrimitive>singletonList(relation));
- model.updateTags(tagPaster.execute());
+
+ 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());
}
@@ -372,7 +398,6 @@ public class TagTable extends JTable {
*/
protected void init() {
setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
- //setCellSelectionEnabled(true);
setRowSelectionAllowed(true);
setColumnSelectionAllowed(true);
setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
@@ -463,7 +488,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;
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
index 6bd1099..970b1ec 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
@@ -122,8 +122,21 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
public String getRawName() {
return group != null ? group.getRawName() + "/" + name : name;
}
+
+ /**
+ * 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 null;
+ }
- /*
+ /**
* Called from the XML parser to set the icon.
* This task is performed in the background in order to speedup startup.
*
@@ -149,13 +162,13 @@ 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);
}
}
});
}
- /*
+ /**
* Called from the XML parser to set the types this preset affects.
*/
public void setType(String types) throws SAXException {
@@ -166,7 +179,7 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
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);
}
}
@@ -175,7 +188,7 @@ 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);
}
}
@@ -400,7 +413,7 @@ 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() {
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItem.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItem.java
index c31b5d4..3b66147 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItem.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItem.java
@@ -4,7 +4,9 @@ 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;
@@ -25,12 +27,23 @@ public abstract class TaggingPresetItem {
return;
}
AutoCompletionList list = new AutoCompletionList();
- Main.main.getEditLayer().data.getAutoCompletionManager().populateWithTagValues(list, key);
+ 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() {
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
index e0ce92b..a5aac00 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
@@ -1,6 +1,9 @@
// 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;
@@ -33,30 +36,28 @@ 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.xml.sax.SAXException;
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.QuadStateCheckBox;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPritority;
+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.UrlLabel;
import org.openstreetmap.josm.tools.Utils;
-import org.openstreetmap.josm.tools.GBC;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.I18n.trc;
+import org.xml.sax.SAXException;
/**
* Class that contains all subtypes of TaggingPresetItem, static supplementary data, types and methods
@@ -77,7 +78,7 @@ public final class TaggingPresetItems {
/**
* Last value of each key used in presets, used for prefilling corresponding fields
*/
- private static final HashMap<String,String> lastValue = new HashMap<String,String>();
+ private static final Map<String,String> lastValue = new HashMap<String,String>();
public static class PresetListEntry {
public String value;
@@ -202,7 +203,7 @@ public final class TaggingPresetItems {
public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
String cstring;
if(count > 0 && !required) {
- cstring = "0,"+String.valueOf(count);
+ cstring = "0,"+count;
} else if(count > 0) {
cstring = String.valueOf(count);
} else if(!required) {
@@ -294,59 +295,80 @@ public final class TaggingPresetItems {
}
}
- public static class Label extends TaggingPresetItem {
+ /**
+ * 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;
- @Override
- public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
+ protected final void initializeLocaleText(String defaultText) {
if (locale_text == null) {
- if (text_context != 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));
}
}
- p.add(new JLabel(locale_text), GBC.eol());
- return false;
}
@Override
- public void addCommands(List<Tag> changedTags) {
+ 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 "Label ["
- + (text != null ? "text=" + text + ", " : "")
- + (text_context != null ? "text_context=" + text_context
- + ", " : "")
- + (locale_text != null ? "locale_text=" + locale_text : "")
- + "]";
+ 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 TaggingPresetItem {
+ public static class Link extends TaggingPresetTextItem {
+ /**
+ * The link to display
+ */
public String href;
- public String text;
- public String text_context;
- public String locale_text;
+
+ /**
+ * The localized version of {@link #href}
+ */
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));
- }
- }
+ initializeLocaleText(tr("More information about this feature"));
String url = locale_href;
if (url == null) {
url = href;
@@ -358,7 +380,10 @@ public final class TaggingPresetItems {
}
@Override
- public void addCommands(List<Tag> changedTags) {
+ protected String fieldsToString() {
+ return super.fieldsToString()
+ + (href != null ? "href=" + href + ", " : "")
+ + (locale_href != null ? "locale_href=" + locale_href + ", " : "");
}
}
@@ -388,13 +413,23 @@ public final class TaggingPresetItems {
}
}
- public static class Optional extends TaggingPresetItem {
+ 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(tr("Optional Attributes:")), GBC.eol());
+ 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;
}
@@ -405,15 +440,19 @@ public final class TaggingPresetItems {
@Override
public String toString() {
- return "Optional";
+ return "Space";
}
}
- public static class Space extends TaggingPresetItem {
+ /**
+ * 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 JLabel(" "), GBC.eol()); // space
+ p.add(new JSeparator(), GBC.eol().fill(GBC.HORIZONTAL).insets(0, 5, 0, 5));
return false;
}
@@ -423,11 +462,10 @@ public final class TaggingPresetItems {
@Override
public String toString() {
- return "Space";
+ return "ItemSeparator";
}
}
-
public static abstract class KeyedItem extends TaggingPresetItem {
public String key;
@@ -512,7 +550,7 @@ public final class TaggingPresetItems {
AutoCompletingTextField textField = new AutoCompletingTextField();
initAutoCompletionField(textField, key);
if (length != null && !length.isEmpty()) {
- textField.setMaxChars(new Integer(length));
+ textField.setMaxChars(Integer.valueOf(length));
}
if (usage.unused()){
if (auto_increment_selected != 0 && auto_increment != null) {
@@ -574,10 +612,11 @@ public final class TaggingPresetItems {
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 = ((Number)NumberFormat.getIntegerInstance().parse(ai.replace("+", ""))).intValue();
+ final int buttonvalue = (NumberFormat.getIntegerInstance().parse(ai.replace("+", ""))).intValue();
if (auto_increment_selected == buttonvalue) aibutton.setSelected(true);
aibutton.addActionListener(new ActionListener() {
@Override
@@ -587,13 +626,14 @@ public final class TaggingPresetItems {
});
pnl.add(aibutton, GBC.std());
} catch (ParseException x) {
- System.err.println("Cannot parse auto-increment value of '" + ai + "' into an integer");
+ 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
@@ -601,6 +641,7 @@ public final class TaggingPresetItems {
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) {
@@ -634,7 +675,7 @@ public final class TaggingPresetItems {
// return if unchanged
String v = getValue(value);
if (v == null) {
- System.err.println("No 'last value' support for component " + value);
+ Main.error("No 'last value' support for component " + value);
return;
}
@@ -685,8 +726,8 @@ public final class TaggingPresetItems {
@Override
boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
- Integer cols = new Integer(columns);
- int rows = (int) Math.ceil((double)checks.size()/cols.doubleValue());
+ 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) {
@@ -699,6 +740,9 @@ public final class TaggingPresetItems {
@Override
void addCommands(List<Tag> changedTags) {
+ for (Check check : checks) {
+ check.addCommands(changedTags);
+ }
}
@Override
@@ -823,6 +867,8 @@ public final class TaggingPresetItems {
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>();
@@ -879,17 +925,17 @@ public final class TaggingPresetItems {
initListEntriesFromAttributes();
} else {
if (values != null) {
- System.err.println(tr("Warning in tagging preset \"{0}-{1}\": "
+ 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) {
- System.err.println(tr("Warning in tagging preset \"{0}-{1}\": "
+ 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) {
- System.err.println(tr("Warning in tagging preset \"{0}-{1}\": "
+ Main.warn(tr("Warning in tagging preset \"{0}-{1}\": "
+ "Ignoring ''{2}'' attribute as ''{3}'' elements are given.",
key, text, "short_descriptions", "list_entry"));
}
@@ -915,17 +961,17 @@ public final class TaggingPresetItems {
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();
+ // 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 {
- System.err.println(tr("Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is not \"{2}\"", key, text,
+ 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) {
- System.err.println(tr("Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' threw {2} ({3})", key, text,
+ Main.error(tr("Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' threw {2} ({3})", key, text,
e.getClass().getName(), e.getMessage()));
}
}
@@ -942,12 +988,12 @@ public final class TaggingPresetItems {
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));
+ 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) {
- System.err.println(tr("Broken tagging preset \"{0}-{1}\" - number of items in ''short_descriptions'' must be the same as in ''values''", key, text));
+ 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;
}
@@ -968,8 +1014,8 @@ public final class TaggingPresetItems {
return display_array;
}
- protected String getDisplayIfNull(String display) {
- return display;
+ protected String getDisplayIfNull() {
+ return null;
}
@Override
@@ -978,7 +1024,7 @@ public final class TaggingPresetItems {
String display = (obj == null) ? null : obj.toString();
String value = null;
if (display == null) {
- display = getDisplayIfNull(display);
+ display = getDisplayIfNull();
}
if (display != null) {
@@ -1121,11 +1167,11 @@ public final class TaggingPresetItems {
AutoCompletingTextField tf = new AutoCompletingTextField();
initAutoCompletionField(tf, key);
if (length != null && !length.isEmpty()) {
- tf.setMaxChars(new Integer(length));
+ tf.setMaxChars(Integer.valueOf(length));
}
AutoCompletionList acList = tf.getAutoCompletionList();
if (acList != null) {
- acList.add(getDisplayValues(), AutoCompletionItemPritority.IS_IN_STANDARD);
+ acList.add(getDisplayValues(), AutoCompletionItemPriority.IS_IN_STANDARD);
}
combo.setEditor(tf);
@@ -1166,12 +1212,11 @@ public final class TaggingPresetItems {
}
@Override
- protected String getDisplayIfNull(String display) {
+ protected String getDisplayIfNull() {
if (combo.isEditable())
return combo.getEditor().getItem().toString();
else
- return display;
-
+ return null;
}
}
public static class MultiSelect extends ComboMultiSelect {
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java
index d59aba1..67404d8 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java
@@ -9,6 +9,7 @@ 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;
@@ -17,6 +18,7 @@ import javax.swing.JPopupMenu;
import javax.swing.JSeparator;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.tools.PresetTextComparator;
public class TaggingPresetMenu extends TaggingPreset {
@@ -31,11 +33,6 @@ public class TaggingPresetMenu extends TaggingPreset {
tr("Preset group {0}", getLocaleName())));
putValue("toolbar", "tagginggroup_" + getRawName());
}
-
- @Override
- public void setIcon(String iconName) {
- super.setIcon(iconName);
- }
private Component copyMenuComponent(Component menuComponent) {
if (menuComponent instanceof JMenu) {
@@ -84,7 +81,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];
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java
index 1612f63..0efe5fe 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java
@@ -1,6 +1,8 @@
// 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;
@@ -14,15 +16,13 @@ import java.util.List;
import javax.swing.JOptionPane;
-import org.xml.sax.SAXException;
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 static org.openstreetmap.josm.tools.I18n.tr;
+import org.xml.sax.SAXException;
/**
* The tagging presets reader.
@@ -30,15 +30,13 @@ import static org.openstreetmap.josm.tools.I18n.tr;
*/
public final class TaggingPresetReader {
- /**
- * Constructs a new {@code TaggingPresetReader}.
- */
- public TaggingPresetReader() {
+ private TaggingPresetReader() {
+ // Hide default constructor for utils classes
}
private static File zipIcons = null;
- public static LinkedList<String> getPresetSources() {
+ public static List<String> getPresetSources() {
LinkedList<String> sources = new LinkedList<String>();
for (SourceEntry e : (new TaggingPresetPreference.PresetPrefHelper()).get()) {
@@ -66,6 +64,7 @@ public final class TaggingPresetReader {
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;
@@ -74,7 +73,7 @@ public final class TaggingPresetReader {
List<TaggingPresetItems.PresetListEntry> listEntries = new LinkedList<TaggingPresetItems.PresetListEntry>();
if (validate) {
- parser.startWithValidation(in, "http://josm.openstreetmap.de/tagging-preset-1.0", "resource://data/tagging-preset.xsd");
+ parser.startWithValidation(in, Main.JOSM_WEBSITE+"/tagging-preset-1.0", "resource://data/tagging-preset.xsd");
} else {
parser.start(in);
}
@@ -147,6 +146,10 @@ public final class TaggingPresetReader {
throw new SAXException(tr("Preset sub element without parent"));
}
}
+ if (!all.isEmpty() && !checks.isEmpty()) {
+ all.getLast().data.addAll(checks);
+ checks.clear();
+ }
return all;
}
@@ -154,7 +157,7 @@ public final class TaggingPresetReader {
Collection<TaggingPreset> tp;
MirroredInputStream s = new MirroredInputStream(source);
try {
- InputStream zip = s.getZipEntry("xml","preset");
+ InputStream zip = s.findZipEntryInputStream("xml","preset");
if(zip != null) {
zipIcons = s.getFile();
}
@@ -181,8 +184,8 @@ public final class TaggingPresetReader {
try {
allPresets.addAll(readAll(source, validate));
} catch (IOException e) {
- System.err.println(e.getClass().getName()+": "+e.getMessage());
- System.err.println(source);
+ Main.error(e);
+ Main.error(source);
JOptionPane.showMessageDialog(
Main.parent,
tr("Could not read tagging preset source: {0}",source),
@@ -190,11 +193,11 @@ public final class TaggingPresetReader {
JOptionPane.ERROR_MESSAGE
);
} catch (SAXException e) {
- System.err.println(e.getClass().getName()+": "+e.getMessage());
- System.err.println(source);
+ Main.error(e);
+ Main.error(source);
JOptionPane.showMessageDialog(
Main.parent,
- tr("Error parsing {0}: ", source)+e.getMessage(),
+ "<html>" + tr("Error parsing {0}: ", source) + "<br><br><table width=600>" + e.getMessage() + "</table></html>",
tr("Error"),
JOptionPane.ERROR_MESSAGE
);
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java
index 8625b50..75baaaf 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java
@@ -14,7 +14,7 @@ import org.openstreetmap.josm.gui.ExtendedDialog;
* The tagging presets search dialog (F3).
* @since 3388
*/
-public class TaggingPresetSearchDialog extends ExtendedDialog {
+public final class TaggingPresetSearchDialog extends ExtendedDialog {
private TaggingPresetSelector selector;
@@ -57,7 +57,9 @@ public class TaggingPresetSearchDialog extends ExtendedDialog {
super.buttonAction(buttonIndex, evt);
if (buttonIndex == 0) {
TaggingPreset preset = selector.getSelectedPreset();
- preset.actionPerformed(null);
+ if (preset != null) {
+ preset.actionPerformed(null);
+ }
}
selector.savePreferences();
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java
index 02b97e1..29c8383 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java
@@ -122,18 +122,19 @@ public class TaggingPresetSelector extends JPanel implements SelectionChangedLis
this.preset = preset;
TaggingPreset group = preset.group;
while (group != null) {
- for (String word: group.getLocaleName().toLowerCase().split("\\s")) {
- groups.add(word);
- }
+ Collections.addAll(groups, group.getLocaleName().toLowerCase().split("\\s"));
group = group.group;
}
- for (String word: preset.getLocaleName().toLowerCase().split("\\s")) {
- names.add(word);
- }
+ Collections.addAll(names, preset.getLocaleName().toLowerCase().split("\\s"));
for (TaggingPresetItem item: preset.data) {
if (item instanceof KeyedItem) {
tags.add(((KeyedItem) item).key);
- // Should combo values also be added?
+ 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);
}
@@ -151,7 +152,7 @@ public class TaggingPresetSelector extends JPanel implements SelectionChangedLis
boolean found = false;
boolean foundFirst = false;
for (String value: values) {
- int index = value.indexOf(word);
+ int index = value.toLowerCase().indexOf(word);
if (index == 0) {
foundFirst = true;
break;
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSeparator.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSeparator.java
index 8ae15f9..5536af8 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSeparator.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSeparator.java
@@ -1,6 +1,10 @@
// 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/ac/AutoCompletingComboBox.java b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
index 14f2838..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;
@@ -229,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();
}
@@ -242,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
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 59b7204..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;
@@ -63,7 +63,7 @@ public class AutoCompletionItemPritority implements Comparable<AutoCompletionIte
* Currently, being in the current DataSet is worth more than being in the Presets.
*/
@Override
- public int compareTo(AutoCompletionItemPritority other) {
+ public int compareTo(AutoCompletionItemPriority other) {
int sel = Boolean.valueOf(selected).compareTo(other.selected);
if (sel != 0) return sel;
@@ -80,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 a9a757f..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 */
@@ -134,7 +134,7 @@ public class AutoCompletionList extends AbstractTableModel {
* @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;
}
@@ -290,12 +290,4 @@ public class AutoCompletionList extends AbstractTableModel {
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 730fb4e..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() {
diff --git a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java
index 4537f3f..c75963c 100644
--- a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java
+++ b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java
@@ -11,6 +11,7 @@ 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.Relation;
@@ -155,7 +156,7 @@ public class AutoCompletionManager implements DataSetListener {
try {
presetTagCache.putAll(ki.key, ki.getValues());
} catch (NullPointerException e) {
- System.err.println(p+": Unable to cache "+ki);
+ Main.error(p+": Unable to cache "+ki);
}
}
} else if (item instanceof TaggingPresetItems.Roles) {
@@ -214,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);
}
/**
@@ -249,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);
}
}
diff --git a/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java b/src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java
similarity index 83%
rename from src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java
rename to src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java
index e3eb314..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,8 +57,7 @@ public class AdjustmentSynchronizer implements AdjustmentListener {
}
/**
- * event handler for {@link AdjustmentEvent}s
- *
+ * Event handler for {@link AdjustmentEvent}s
*/
@Override
public void adjustmentValueChanged(AdjustmentEvent e) {
@@ -69,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
*/
@@ -84,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
@@ -98,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>
@@ -106,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");
diff --git a/src/org/openstreetmap/josm/gui/util/GuiHelper.java b/src/org/openstreetmap/josm/gui/util/GuiHelper.java
index 6978688..30b4e0b 100644
--- a/src/org/openstreetmap/josm/gui/util/GuiHelper.java
+++ b/src/org/openstreetmap/josm/gui/util/GuiHelper.java
@@ -1,9 +1,9 @@
// 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;
@@ -36,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
*/
@@ -188,7 +193,6 @@ public class GuiHelper {
}
if (s.length>1) {
float[] dash= new float[s.length-1];
- boolean error = false;
float sumAbs = 0;
try {
for (int i=0; i<s.length-1; i++) {
@@ -196,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
diff --git a/src/org/openstreetmap/josm/gui/util/HighlightHelper.java b/src/org/openstreetmap/josm/gui/util/HighlightHelper.java
index 457ecff..7752025 100644
--- a/src/org/openstreetmap/josm/gui/util/HighlightHelper.java
+++ b/src/org/openstreetmap/josm/gui/util/HighlightHelper.java
@@ -6,6 +6,7 @@ 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;
@@ -17,7 +18,7 @@ import org.openstreetmap.josm.data.osm.Relation;
*/
public class HighlightHelper {
Set<OsmPrimitive> highlightedPrimitives = new HashSet<OsmPrimitive>();
-
+
/**
* Highlight and remember given primitives
* @param prims - primitives to highlight/unhighlight
@@ -25,7 +26,7 @@ public class HighlightHelper {
public boolean highlight(Collection <? extends OsmPrimitive> prims) {
return highlight(prims, false);
}
-
+
/**
* Highlight and remember given primitives
* @param prims - primitives to highlight/unhighlight
@@ -50,7 +51,7 @@ public class HighlightHelper {
return needsRepaint;
}
-
+
/**
* Highlight and remember given primitives, forgetting previously highlighted by this instance
* @param prims - primitives to highlight/unhighlight
@@ -58,7 +59,7 @@ public class HighlightHelper {
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
@@ -66,21 +67,28 @@ public class HighlightHelper {
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: ((Relation) p).getMemberPrimitives()) {
- needRepaint |= setHighlight(m, flag);
+ for (OsmPrimitive m : r.getMemberPrimitives()) {
+ if (!(m instanceof Relation) || !seenRelations.contains(m)) {
+ needRepaint |= setHighlight(m, flag, seenRelations);
+ }
}
return needRepaint;
- } else
- if (flag) {
+ } else if (flag) {
if (highlightedPrimitives.add(p)) {
p.setHighlighted(true);
return true;
@@ -93,7 +101,7 @@ public class HighlightHelper {
}
return false;
}
-
+
/**
* Clear highlighting of all remembered primitives
*/
@@ -103,7 +111,7 @@ public class HighlightHelper {
}
highlightedPrimitives.clear();
}
-
+
/**
* Slow method to import all currently highlighted primitives into this instance
*/
@@ -113,7 +121,7 @@ public class HighlightHelper {
highlightedPrimitives.addAll( ds.allNonDeletedPrimitives() );
}
}
-
+
/**
* Slow method to remove highlights from all primitives
*/
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
index d72e737..5d7043c 100644
--- a/src/org/openstreetmap/josm/gui/util/TableHelper.java
+++ b/src/org/openstreetmap/josm/gui/util/TableHelper.java
@@ -9,12 +9,17 @@ import javax.swing.table.TableCellRenderer;
/**
* The class that provide common JTable customization methods
*/
-public class TableHelper {
+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);
- */
+ * (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++) {
@@ -25,5 +30,4 @@ public class TableHelper {
}
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
index b2d1410..7b7028b 100644
--- a/src/org/openstreetmap/josm/gui/widgets/AbstractIdTextField.java
+++ b/src/org/openstreetmap/josm/gui/widgets/AbstractIdTextField.java
@@ -3,7 +3,7 @@ package org.openstreetmap.josm.gui.widgets;
import javax.swing.text.JTextComponent;
-import org.openstreetmap.josm.gui.widgets.JosmTextField;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.tools.Utils;
/**
@@ -38,7 +38,7 @@ public abstract class AbstractIdTextField<T extends AbstractTextComponentValidat
validator = klass.getConstructor(JTextComponent.class).newInstance(this);
}
} catch (Exception e) {
- System.err.println(e.getClass().getName()+": "+e.getMessage());
+ Main.error(e);
} finally {
this.validator = validator;
}
diff --git a/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java b/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java
index f6aee67..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;
@@ -18,7 +18,6 @@ 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.OsmUrlToBounds;
diff --git a/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java b/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java
index 0f6188d..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;
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/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 fcea3c8..00c60f6 100644
--- a/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java
+++ b/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java
@@ -11,7 +11,7 @@ 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;
@@ -80,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));
}
@@ -99,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.
@@ -132,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) {
diff --git a/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java b/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java
index 294683c..7cc39ff 100644
--- a/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java
+++ b/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java
@@ -10,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>.
@@ -102,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/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 c4003f7..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,7 @@ import java.util.Map;
import javax.swing.UIManager;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.tools.Utils;
/**
@@ -69,10 +67,9 @@ import org.openstreetmap.josm.tools.Utils;
* 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);
@@ -1262,7 +1259,7 @@ public class MultiSplitLayout implements LayoutManager {
return root.getChildren().get(0);
}
catch (Exception e) {
- System.err.println(e);
+ Main.error(e);
}
finally {
Utils.close(r);
@@ -1319,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 98%
rename from src/org/openstreetmap/josm/gui/MultiSplitPane.java
rename to src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java
index cf70192..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;
diff --git a/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java b/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
similarity index 79%
rename from src/org/openstreetmap/josm/gui/QuadStateCheckBox.java
rename to src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
index 20778e3..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) {
@@ -53,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 {
@@ -74,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);
@@ -102,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.
@@ -138,8 +184,7 @@ public class QuadStateCheckBox extends JCheckBox {
@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. */
+ /** We disable focusing on the component when it is not enabled. */
@Override public void setEnabled(boolean b) {
setFocusable(b);
other.setEnabled(b);
diff --git a/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java b/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java
index cd9f7ff..d1381ff 100644
--- a/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java
+++ b/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java
@@ -3,7 +3,6 @@ package org.openstreetmap.josm.gui.widgets;
import static org.openstreetmap.josm.tools.I18n.tr;
-import java.awt.Image;
import java.awt.event.ActionEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
@@ -148,9 +147,9 @@ public class TextContextualPopupMenu extends JPopupMenu {
JMenuItem mi = new JMenuItem(action);
mi.setText(label);
if (iconName != null && Main.pref.getBoolean("text.popupmenu.useicons", true)) {
- ImageIcon icon = ImageProvider.get(iconName);
+ ImageIcon icon = new ImageProvider(iconName).setWidth(16).get();
if (icon != null) {
- mi.setIcon(new ImageIcon(icon.getImage().getScaledInstance(16 , 16, Image.SCALE_SMOOTH)));
+ mi.setIcon(icon);
}
}
add(mi);
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 b3594dd..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/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 4255855..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,9 +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 {
/**
@@ -24,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();
}
@@ -59,12 +69,6 @@ public class BoundingBoxDownloader extends OsmServerReader {
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);
@@ -105,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);
diff --git a/src/org/openstreetmap/josm/io/CacheFiles.java b/src/org/openstreetmap/josm/io/CacheFiles.java
index beeec2c..8e87dcc 100644
--- a/src/org/openstreetmap/josm/io/CacheFiles.java
+++ b/src/org/openstreetmap/josm/io/CacheFiles.java
@@ -13,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
@@ -114,8 +115,8 @@ public class CacheFiles {
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;
}
@@ -129,13 +130,18 @@ public class CacheFiles {
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++;
@@ -163,8 +169,8 @@ public class CacheFiles {
img.setLastModified(System.currentTimeMillis());
}
return ImageIO.read(img);
- } catch(Exception e) {
- System.out.println(e.getMessage());
+ } catch (Exception e) {
+ Main.warn(e);
}
return null;
}
@@ -175,11 +181,11 @@ public class CacheFiles {
* @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++;
diff --git a/src/org/openstreetmap/josm/io/Capabilities.java b/src/org/openstreetmap/josm/io/Capabilities.java
index 960adb8..b30d90b 100644
--- a/src/org/openstreetmap/josm/io/Capabilities.java
+++ b/src/org/openstreetmap/josm/io/Capabilities.java
@@ -7,6 +7,9 @@ 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
@@ -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 8d15180..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();
}
@@ -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;
}
@@ -438,7 +483,7 @@ public class ChangesetQuery {
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 f6997b0..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().isEmpty() && 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().isEmpty() && 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/FileImporter.java b/src/org/openstreetmap/josm/io/FileImporter.java
index c687a9e..50590f3 100644
--- a/src/org/openstreetmap/josm/io/FileImporter.java
+++ b/src/org/openstreetmap/josm/io/FileImporter.java
@@ -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) {
diff --git a/src/org/openstreetmap/josm/io/GeoJSONWriter.java b/src/org/openstreetmap/josm/io/GeoJSONWriter.java
index 0786989..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.accept(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/GpxReader.java b/src/org/openstreetmap/josm/io/GpxReader.java
index dd4895b..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;
@@ -19,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;
@@ -30,6 +31,7 @@ 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;
/**
@@ -405,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);
}
}
@@ -454,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;
@@ -463,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 7617be3..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;
@@ -65,7 +65,7 @@ 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 = " ";
@@ -81,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);
@@ -156,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/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 5f57869..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;
@@ -21,6 +21,7 @@ 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;
/**
@@ -90,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;
@@ -119,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 {
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) {
@@ -158,7 +180,9 @@ public class MirroredInputStream extends InputStream {
}
Main.pref.putCollection(prefKey, null);
}
- } catch (java.net.MalformedURLException e) {}
+ } catch (MalformedURLException e) {
+ Main.warn(e);
+ }
}
/**
@@ -231,13 +255,12 @@ public class MirroredInputStream extends InputStream {
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;
@@ -293,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());
diff --git a/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java b/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
index 57f0804..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>
*/
@@ -488,7 +488,7 @@ 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;
@@ -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 01618bb..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;
@@ -61,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 afc142c..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,6 +12,7 @@ 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;
@@ -195,12 +194,12 @@ 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);
@@ -209,8 +208,8 @@ public class NmeaReader {
currentTrack.add(ps.waypoints);
data.tracks.add(new ImmutableGpxTrack(currentTrack, Collections.<String, Object>emptyMap()));
- } catch (IOException e) {
- // TODO tell user about the problem?
+ } catch (Exception e) {
+ Main.warn(e);
} finally {
Utils.close(rd);
}
@@ -232,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.isEmpty())
- 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("\\*");
@@ -246,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;
@@ -274,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;
}
@@ -446,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;
diff --git a/src/org/openstreetmap/josm/io/OsmApi.java b/src/org/openstreetmap/josm/io/OsmApi.java
index 1fceb53..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;
@@ -74,7 +75,7 @@ public class OsmApi extends OsmConnection {
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
@@ -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);
}
}
@@ -536,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));
}
@@ -545,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."));
}
/**
@@ -560,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 {
@@ -620,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();
+ }
}
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;
}
}
@@ -656,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();
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/OsmChangesetContentParser.java b/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java
index 67ee487..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 fd1813e..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);
}
}
diff --git a/src/org/openstreetmap/josm/io/OsmHistoryReader.java b/src/org/openstreetmap/josm/io/OsmHistoryReader.java
index 084a635..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,27 +6,18 @@ 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.
@@ -34,24 +25,14 @@ import org.xml.sax.helpers.DefaultHandler;
* It is slightly different from {@link OsmReader} because we don't build an internal graph of
* {@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/OsmReader.java b/src/org/openstreetmap/josm/io/OsmReader.java
index de2ae22..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;
@@ -52,7 +54,7 @@ public class OsmReader extends AbstractReader {
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) {
@@ -170,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);
@@ -232,7 +234,7 @@ public class OsmReader extends AbstractReader {
}
}
if (w.isDeleted() && !nodeIds.isEmpty()) {
- System.out.println(tr("Deleted way {0} contains nodes", w.getUniqueId()));
+ Main.info(tr("Deleted way {0} contains nodes", w.getUniqueId()));
nodeIds = new ArrayList<Long>();
}
ways.put(wd.getUniqueId(), nodeIds);
@@ -279,7 +281,7 @@ public class OsmReader extends AbstractReader {
}
}
if (r.isDeleted() && !members.isEmpty()) {
- System.out.println(tr("Deleted relation {0} contains members", r.getUniqueId()));
+ Main.info(tr("Deleted relation {0} contains members", r.getUniqueId()));
members = new ArrayList<RelationMemberData>();
}
relations.put(rd.getUniqueId(), members);
@@ -355,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();
@@ -444,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 {
@@ -466,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
@@ -495,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
@@ -505,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
diff --git a/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java b/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java
index 39fcacb..b8953f5 100644
--- a/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java
+++ b/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java
@@ -102,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;
}
/**
diff --git a/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java b/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java
index a4a7561..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;
diff --git a/src/org/openstreetmap/josm/io/OsmServerLocationReader.java b/src/org/openstreetmap/josm/io/OsmServerLocationReader.java
index 5925528..ede171d 100644
--- a/src/org/openstreetmap/josm/io/OsmServerLocationReader.java
+++ b/src/org/openstreetmap/josm/io/OsmServerLocationReader.java
@@ -5,9 +5,7 @@ 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;
@@ -15,16 +13,41 @@ 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;
}
@@ -46,128 +69,92 @@ public class OsmServerLocationReader extends OsmServerReader {
}
}
- /**
- * 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 b75d5d7..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;
@@ -15,7 +14,6 @@ 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;
-import org.xml.sax.SAXException;
/**
* OsmServerObjectReader reads an individual object from the OSM server.
@@ -109,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 {
@@ -128,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));
diff --git a/src/org/openstreetmap/josm/io/OsmServerReader.java b/src/org/openstreetmap/josm/io/OsmServerReader.java
index a6efaef..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,6 +33,12 @@ 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
@@ -100,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();
@@ -139,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();
@@ -161,28 +166,81 @@ public abstract class OsmServerReader extends OsmConnection {
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;
}
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/OsmWriter.java b/src/org/openstreetmap/josm/io/OsmWriter.java
index 6600e6d..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;
@@ -162,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)+"' />");
}
}
diff --git a/src/org/openstreetmap/josm/io/ProgressInputStream.java b/src/org/openstreetmap/josm/io/ProgressInputStream.java
index e9b31df..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;
diff --git a/src/org/openstreetmap/josm/io/UTFInputStreamReader.java b/src/org/openstreetmap/josm/io/UTFInputStreamReader.java
index cb7a90a..294765e 100644
--- a/src/org/openstreetmap/josm/io/UTFInputStreamReader.java
+++ b/src/org/openstreetmap/josm/io/UTFInputStreamReader.java
@@ -10,7 +10,8 @@ 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.
diff --git a/src/org/openstreetmap/josm/io/XmlWriter.java b/src/org/openstreetmap/josm/io/XmlWriter.java
index bf93c15..70b37af 100644
--- a/src/org/openstreetmap/josm/io/XmlWriter.java
+++ b/src/org/openstreetmap/josm/io/XmlWriter.java
@@ -1,10 +1,11 @@
-// 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.
@@ -64,7 +65,7 @@ public class XmlWriter implements Closeable {
/**
* 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('>', ">");
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 a79182a..eb9a485 100644
--- a/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
+++ b/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
@@ -8,13 +8,14 @@ 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 {
@@ -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/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/WMSGrabber.java b/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java
index 11c6c6a..8270682 100644
--- a/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java
+++ b/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java
@@ -157,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()) {
diff --git a/src/org/openstreetmap/josm/io/imagery/WMSImagery.java b/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
index 6d9330e..4bdefcd 100644
--- a/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
+++ b/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
@@ -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;
@@ -126,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);
@@ -148,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(""));
}
});
@@ -174,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);
}
}
@@ -223,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);
}
@@ -275,7 +279,7 @@ public class WMSImagery {
return missing;
else {
String content = (String) getContent(child);
- return (content != null) ? content : empty;
+ return (!content.isEmpty()) ? content : empty;
}
}
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java b/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
index 61d8a0d..2171e4b 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
@@ -78,7 +78,7 @@ public class AddTagsDialog extends ExtendedDialog implements SelectionChangedLis
*/
static class ExistingValues {
String tag;
- HashMap<String, Integer> valueCount;
+ Map<String, Integer> valueCount;
public ExistingValues(String tag) {
this.tag=tag; valueCount=new HashMap<String, Integer>();
}
@@ -134,7 +134,7 @@ public class AddTagsDialog extends ExtendedDialog implements SelectionChangedLis
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) {
+ public Class<?> getColumnClass(int c) {
return types[c];
}
};
@@ -287,7 +287,7 @@ public class AddTagsDialog extends ExtendedDialog implements SelectionChangedLis
findExistingTags();
}
- /*
+ /**
* parse addtags parameters Example URL (part):
* addtags=wikipedia:de%3DResidenzschloss Dresden|name:en%3DDresden Castle
*/
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java
index 38c857a..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);
@@ -48,8 +48,7 @@ public class RemoteControl
* @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 e1292db..17d5953 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java
@@ -5,10 +5,12 @@ 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;
import org.openstreetmap.josm.Main;
@@ -36,7 +38,7 @@ public class RemoteControlHttpServer extends Thread {
instance = new RemoteControlHttpServer(port);
instance.start();
} catch (BindException ex) {
- Main.warn(marktr("Warning: Cannot start remotecontrol server on port {0}: {1}"),
+ Main.warn(marktr("Cannot start remotecontrol server on port {0}: {1}"),
Integer.toString(port), ex.getLocalizedMessage());
} catch (IOException ioe) {
ioe.printStackTrace();
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java b/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
index 31c12b0..30c3acd 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
@@ -18,11 +18,11 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.StringTokenizer;
import java.util.TreeMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
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;
@@ -75,6 +75,7 @@ public class RequestProcessor extends Thread {
/**
* Spawns a new thread for the request
+ * @param request The request to process
*/
public static void processRequest(Socket request) {
RequestProcessor processor = new RequestProcessor(request);
@@ -109,11 +110,11 @@ public class RequestProcessor extends Thread {
}
String commandWithSlash = "/" + command;
if (handlers.get(commandWithSlash) != null) {
- System.out.println("RemoteControl: ignoring duplicate command " + command
+ Main.info("RemoteControl: ignoring duplicate command " + command
+ " with handler " + handler.getName());
} else {
if (!silent) {
- System.out.println("RemoteControl: adding command \"" +
+ Main.info("RemoteControl: adding command \"" +
command + "\" (handled by " + handler.getSimpleName() + ")");
}
handlers.put(commandWithSlash, handler);
@@ -150,7 +151,7 @@ public class RequestProcessor extends Thread {
sendError(out);
return;
}
- System.out.println("RemoteControl received: " + get);
+ Main.info("RemoteControl received: " + get);
StringTokenizer st = new StringTokenizer(get);
if (!st.hasMoreTokens()) {
@@ -210,9 +211,8 @@ public class RequestProcessor extends Thread {
Class<? extends RequestHandler> handlerClass = handlers.get(command);
if (handlerClass == null) {
String usage = getUsageAsHtml();
- String websiteDoc = "http://josm.openstreetmap.de/wiki/Help/Preferences/RemoteControl";
- String help = "No command specified! The following commands are available:<ul>"
- + usage.toString()
+ 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 {
@@ -372,31 +372,30 @@ public class RequestProcessor extends Thread {
} else {
r.append(", ");
}
- r.append(getHanldlerInfoAsJSON(p.getKey()));
+ r.append(getHandlerInfoAsJSON(p.getKey()));
}
r.append("]");
return r.toString();
}
- public static String getHanldlerInfoAsJSON(String cmd) {
+ public static String getHandlerInfoAsJSON(String cmd) {
StringWriter w = new StringWriter();
PrintWriter r = new PrintWriter(w);
RequestHandler handler = null;
try {
- Class c = handlers.get(cmd);
+ Class<?> c = handlers.get(cmd);
if (c==null) return null;
handler = handlers.get(cmd).newInstance();
} catch (Exception ex) {
ex.printStackTrace();
return null;
}
- if (handler==null) return null;
r.printf("{ \"request\" : \"%s\"", cmd);
r.append(", \"parameters\" : [");
- String params[] = handler.getMandatoryParams();
+ String[] params = handler.getMandatoryParams();
if (params != null) {
for (int i = 0; i < params.length; i++) {
if (i == 0) {
@@ -408,7 +407,7 @@ public class RequestProcessor extends Thread {
}
}
r.append("], \"optional\" : [");
- String optional[] = handler.getOptionalParams();
+ String[] optional = handler.getOptionalParams();
if (optional != null) {
for (int i = 0; i < optional.length; i++) {
if (i == 0) {
@@ -421,7 +420,7 @@ public class RequestProcessor extends Thread {
}
r.append("], \"examples\" : [");
- String examples[] = handler.getUsageExamples();
+ String[] examples = handler.getUsageExamples(cmd.substring(1));
if (examples != null) {
for (int i = 0; i < examples.length; i++) {
if (i == 0) {
@@ -443,21 +442,19 @@ public class RequestProcessor extends Thread {
}
}
-
/**
* Reports HTML message with the description of all available commands
- * @return
+ * @return HTML message with the description of all available commands
* @throws IllegalAccessException
* @throws InstantiationException
*/
public static String getUsageAsHtml() throws IllegalAccessException, InstantiationException {
- // no handler found
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();
+ String[] examples = sample.getUsageExamples(handler.getKey().substring(1));
usage.append("<li>");
usage.append(handler.getKey());
if (mandatory != null) {
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java
index 5b51e0f..b8697d5 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java
@@ -4,7 +4,8 @@ package org.openstreetmap.josm.io.remotecontrol.handler;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Point;
-import java.util.HashMap;
+import java.util.Map;
+
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.AutoScaleAction;
import org.openstreetmap.josm.command.AddCommand;
@@ -14,7 +15,6 @@ 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;
-import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
/**
* Handler for add_node request.
@@ -73,17 +73,17 @@ public class AddNodeHandler extends RequestHandler {
* Adds a node, implements the GET /add_node?lon=...&lat=... request.
* @param args
*/
- private void addNode(HashMap<String, String> args){
+ private void addNode(Map<String, String> args){
// Parse the arguments
- System.out.println("Adding node at (" + lat + ", " + lon + ")");
+ Main.info("Adding node at (" + lat + ", " + lon + ")");
// Create a new node
LatLon ll = new LatLon(lat, lon);
Node nd = null;
- if (Main.map != null && Main.map.mapView != 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)) {
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java
index 1335578..b8c1b62 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java
@@ -9,6 +9,7 @@ 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;
@@ -22,7 +23,6 @@ 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}.
@@ -39,7 +39,7 @@ public class AddWayHandler extends RequestHandler {
/**
* The place to remeber already added nodes (they are reused if needed @since 5845
*/
- HashMap<LatLon, Node> addedNodes;
+ Map<LatLon, Node> addedNodes;
@Override
public String[] getMandatoryParams() {
@@ -114,7 +114,7 @@ public class AddWayHandler extends RequestHandler {
Node findOrCreateNode(LatLon ll, List<Command> commands) {
Node nd = null;
- if (Main.map != null && Main.map.mapView != 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)) {
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java
index 98a85a5..fbedc54 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java
@@ -32,7 +32,7 @@ public class FeaturesHandler extends RequestHandler {
} else {
buf.append(", ");
}
- String info = RequestProcessor.getHanldlerInfoAsJSON("/"+s);
+ String info = RequestProcessor.getHandlerInfoAsJSON("/"+s);
if (info!=null) {
buf.append(info);
} else {
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java
index 8660237..4d15935 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java
@@ -1,9 +1,9 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io.remotecontrol.handler;
-import java.util.Arrays;
import static org.openstreetmap.josm.tools.I18n.tr;
+import java.util.Arrays;
import java.util.HashMap;
import org.openstreetmap.josm.Main;
@@ -60,7 +60,7 @@ public class ImageryHandler extends RequestHandler {
try {
imgInfo.setDefaultMinZoom(Integer.parseInt(min_zoom));
} catch (NumberFormatException e) {
- System.err.println("NumberFormatException ("+e.getMessage()+")");
+ Main.error(e);
}
}
String max_zoom = args.get("max_zoom");
@@ -68,7 +68,7 @@ public class ImageryHandler extends RequestHandler {
try {
imgInfo.setDefaultMaxZoom(Integer.parseInt(max_zoom));
} catch (NumberFormatException e) {
- System.err.println("NumberFormatException ("+e.getMessage()+")");
+ Main.error(e);
}
}
GuiHelper.runInEDT(new Runnable() {
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java
index 67659f4..fe853d7 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java
@@ -34,7 +34,7 @@ public class ImportHandler extends RequestHandler {
suitableDownloadTasks.iterator().next().loadUrl(isLoadInNewLayer(), url.toExternalForm(), null);
}
} catch (Exception ex) {
- System.out.println("RemoteControl: Error parsing import remote control request:");
+ Main.warn("RemoteControl: Error parsing import remote control request:");
ex.printStackTrace();
throw new RequestHandlerErrorException();
}
@@ -52,7 +52,7 @@ public class ImportHandler extends RequestHandler {
@Override
public String[] getUsageExamples() {
- return new String[] { "/import?urlhttp://josm.openstreetmap.de/browser/josm/trunk/data_nodist/direction-arrows.osm" };
+ return new String[] { "/import?url="+Main.JOSM_WEBSITE+"/browser/josm/trunk/data_nodist/direction-arrows.osm" };
}
@Override
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java
index 6646d64..628f504 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java
@@ -29,10 +29,11 @@ import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
import org.openstreetmap.josm.tools.Utils;
/**
- * Handler for load_and_zoom request.
+ * Handler for {@code load_and_zoom} and {@code zoom} requests.
+ * @since 3707
*/
-public class LoadAndZoomHandler extends RequestHandler
-{
+public class LoadAndZoomHandler extends RequestHandler {
+
/**
* The remote control command name used to load data and zoom.
*/
@@ -55,8 +56,7 @@ public class LoadAndZoomHandler extends RequestHandler
private final Set<Long> relations = new HashSet<Long>();
@Override
- public String getPermissionMessage()
- {
+ 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) {
@@ -66,44 +66,42 @@ public class LoadAndZoomHandler extends RequestHandler
}
@Override
- public String[] getMandatoryParams()
- {
+ public String[] getMandatoryParams() {
return new String[] { "bottom", "top", "left", "right" };
}
@Override
- public String[] getOptionalParams()
- {
+ public String[] getOptionalParams() {
return new String[] {"new_layer", "addtags", "select", "zoom_mode"};
}
@Override
public String[] getUsageExamples() {
- if (command.equals(myCommand)) {
+ 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"};
+ "/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"};
+ "/zoom?left=8.19&right=8.20&top=48.605&bottom=48.590&select=node413602999"};
}
}
-
+
@Override
- protected void handleRequest() throws RequestHandlerErrorException
- {
+ 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
- {
+ 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
@@ -115,8 +113,7 @@ public class LoadAndZoomHandler extends RequestHandler
if (present != null && !present.isEmpty()) {
toDownload = new Area(new Rectangle2D.Double(minlon,minlat,maxlon-minlon,maxlat-minlat));
toDownload.subtract(present);
- if (!toDownload.isEmpty())
- {
+ if (!toDownload.isEmpty()) {
// the result might not be a rectangle (L shaped etc)
Rectangle2D downloadBounds = toDownload.getBounds2D();
minlat = downloadBounds.getMinY();
@@ -126,19 +123,16 @@ public class LoadAndZoomHandler extends RequestHandler
}
}
}
- if (toDownload != null && toDownload.isEmpty())
- {
- System.out.println("RemoteControl: no download necessary");
- }
- else
- {
+ 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) {
- System.out.println("RemoteControl: Error parsing load_and_zoom remote control request:");
+ Main.warn("RemoteControl: Error parsing load_and_zoom remote control request:");
ex.printStackTrace();
throw new RequestHandlerErrorException();
}
@@ -158,7 +152,7 @@ public class LoadAndZoomHandler extends RequestHandler
});
}
- final Bounds bbox = new Bounds(new LatLon(minlat, minlon), new LatLon(maxlat, maxlon));
+ 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() {
@@ -244,6 +238,19 @@ public class LoadAndZoomHandler extends RequestHandler
} 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")) {
@@ -261,10 +268,10 @@ public class LoadAndZoomHandler extends RequestHandler
} else if (item.startsWith("rel")) {
relations.add(Long.parseLong(item.substring(3)));
} else {
- System.out.println("RemoteControl: invalid selection '"+item+"' ignored");
+ Main.warn("RemoteControl: invalid selection '"+item+"' ignored");
}
} catch (NumberFormatException e) {
- System.out.println("RemoteControl: invalid selection '"+item+"' ignored");
+ 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 dce637c..592e672 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java
@@ -49,7 +49,7 @@ public class LoadObjectHandler extends RequestHandler {
@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()) {
final boolean newLayer = isLoadInNewLayer();
@@ -87,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/RequestHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java
index ae61740..cfdffd0 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java
@@ -11,6 +11,7 @@ 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;
@@ -32,7 +33,7 @@ public abstract class RequestHandler {
public static final boolean loadInNewLayerDefault = false;
/** The GET request arguments */
- protected HashMap<String,String> args;
+ protected Map<String,String> args;
/** The request URL without "GET". */
protected String request;
@@ -117,6 +118,16 @@ public abstract class RequestHandler {
}
/**
+ * 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.
*
@@ -136,7 +147,7 @@ public abstract class RequestHandler {
{
if (!Main.pref.getBoolean(permissionPref.pref, permissionPref.defaultVal)) {
String err = MessageFormat.format("RemoteControl: ''{0}'' forbidden by preferences", myCommand);
- System.out.println(err);
+ Main.info(err);
throw new RequestHandlerForbiddenException(err);
}
}
@@ -210,7 +221,7 @@ public abstract class RequestHandler {
String value = args.get(key);
if ((value == null) || (value.length() == 0)) {
error = true;
- System.out.println("'" + myCommand + "' remote control request must have '" + key + "' parameter");
+ Main.warn("'" + myCommand + "' remote control request must have '" + key + "' parameter");
missingKeys.add(key);
}
}
diff --git a/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java b/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java
index 3c4a143..68252d2 100644
--- a/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java
+++ b/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java
@@ -65,6 +65,7 @@ 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()) {
@@ -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 b36de07..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,6 +78,8 @@ public class GeoImageSessionImporter implements SessionLayerImporter {
}
}
entries.add(entry);
+ } else if (imgElem.getTagName().equals("show-thumbnails")) {
+ useThumbs = Boolean.parseBoolean(imgElem.getTextContent());
}
}
}
@@ -86,7 +93,7 @@ public class GeoImageSessionImporter implements SessionLayerImporter {
}
}
- 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 0b15b23..127d312 100644
--- a/src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java
+++ b/src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java
@@ -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);
@@ -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));
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 e1057ff..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) {
diff --git a/src/org/openstreetmap/josm/plugins/Plugin.java b/src/org/openstreetmap/josm/plugins/Plugin.java
index a6c9f6e..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,6 +8,8 @@ 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;
@@ -141,8 +143,11 @@ public abstract class Plugin implements MapFrameListener {
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 5b3ad7a..6e7e360 100644
--- a/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
+++ b/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
@@ -113,8 +113,8 @@ 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);
@@ -127,9 +127,9 @@ public class PluginDownloadTask extends PleaseWaitRunnable{
for (int read = in.read(buffer); read != -1; read = in.read(buffer)) {
out.write(buffer, 0, read);
}
- } 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)
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 bef3495..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;
@@ -50,12 +52,12 @@ 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.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;
@@ -65,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 {
@@ -115,29 +117,54 @@ public class PluginHandler {
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();
@@ -150,6 +177,9 @@ public class PluginHandler {
}
}
+ /**
+ * 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"};
/**
@@ -318,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,
@@ -502,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
*/
@@ -520,19 +553,19 @@ 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));
+ 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.println(e.getMessage());
+ Main.error(e.getMessage());
Throwable cause = e.getCause();
if (cause != null) {
msg = cause.getLocalizedMessage();
if (msg != null) {
- System.err.println("Cause: " + cause.getClass().getName()+": " + msg);
+ Main.error("Cause: " + cause.getClass().getName()+": " + msg);
} else {
cause.printStackTrace();
}
@@ -544,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);
}
}
@@ -553,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.
*/
@@ -620,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.
*/
@@ -655,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>();
@@ -697,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)
*/
@@ -784,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();
}
}
@@ -800,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");
@@ -824,20 +860,19 @@ public class PluginHandler {
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);
}
@@ -878,7 +913,7 @@ 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;
}
@@ -906,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
@@ -939,9 +975,14 @@ public class PluginHandler {
return ret == 0;
}
+ /**
+ * 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 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;
}
@@ -985,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;
}
}
@@ -995,14 +1036,14 @@ 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;
@@ -1176,8 +1217,12 @@ 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();
@@ -1187,11 +1232,15 @@ public class PluginHandler {
}
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) {
diff --git a/src/org/openstreetmap/josm/plugins/PluginInformation.java b/src/org/openstreetmap/josm/plugins/PluginInformation.java
index 4aae8b4..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,6 +22,7 @@ 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;
@@ -183,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;
}
}
@@ -199,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));
}
}
}
@@ -208,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) {
diff --git a/src/org/openstreetmap/josm/plugins/PluginListParser.java b/src/org/openstreetmap/josm/plugins/PluginListParser.java
index 8b42e42..e1a975e 100644
--- a/src/org/openstreetmap/josm/plugins/PluginListParser.java
+++ b/src/org/openstreetmap/josm/plugins/PluginListParser.java
@@ -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);
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 27fcdd2..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;
@@ -89,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);
@@ -150,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 fe97eff..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,21 +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.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;
@@ -142,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"));
@@ -165,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) {
@@ -189,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
@@ -216,13 +271,13 @@ public class ReadRemotePluginInformationTask extends PleaseWaitRunnable{
for (int read = in.read(buffer); read != -1; read = in.read(buffer)) {
out.write(buffer, 0, read);
}
- } 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);
@@ -258,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);
@@ -310,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();
}
}
diff --git a/src/org/openstreetmap/josm/tools/AlphanumComparator.java b/src/org/openstreetmap/josm/tools/AlphanumComparator.java
index 84a56f4..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
@@ -32,7 +34,7 @@ import java.util.Comparator;
* 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 f086e84..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;
@@ -21,7 +21,7 @@ import org.openstreetmap.josm.Main;
* @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;
@@ -197,11 +197,12 @@ 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;
}
}
@@ -304,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;
}
diff --git a/src/org/openstreetmap/josm/tools/AudioUtil.java b/src/org/openstreetmap/josm/tools/AudioUtil.java
index e24d463..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;
@@ -16,8 +16,12 @@ import org.openstreetmap.josm.Main;
* @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)
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 cdd7caa..1b6d029 100644
--- a/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
+++ b/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.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;
@@ -23,8 +23,9 @@ 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;
/**
@@ -134,7 +135,7 @@ public final class BugReportExceptionHandler implements Thread.UncaughtException
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",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());
@@ -146,7 +147,7 @@ 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());
}
@@ -195,7 +196,7 @@ public final class BugReportExceptionHandler implements Thread.UncaughtException
gzip.write(debugText.getBytes("UTF-8"));
Utils.close(gzip);
- return new URL("http://josm.openstreetmap.de/josmticket?" +
+ return new URL(Main.JOSM_WEBSITE+"/josmticket?" +
"gdata="+Base64.encode(ByteBuffer.wrap(out.toByteArray()), true));
} catch (IOException e) {
e.printStackTrace();
@@ -212,7 +213,7 @@ public final class BugReportExceptionHandler implements Thread.UncaughtException
public static final UrlLabel getBugReportUrlLabel(String debugText) {
URL url = getBugReportUrl(debugText);
if (url != null) {
- return new UrlLabel(url.toString(), "http://josm.openstreetmap.de/josmticket?...", 2);
+ 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 e1a51b8..05bd837 100644
--- a/src/org/openstreetmap/josm/tools/CheckParameterUtil.java
+++ b/src/org/openstreetmap/josm/tools/CheckParameterUtil.java
@@ -11,11 +11,13 @@ import org.openstreetmap.josm.data.osm.PrimitiveId;
/**
* This utility class provides a collection of static helper methods for checking
* parameters at run-time.
- * @ince 2711
+ * @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
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 1b081e1..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);
}
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 8c3b048..6060201 100644
--- a/src/org/openstreetmap/josm/tools/Diff.java
+++ b/src/org/openstreetmap/josm/tools/Diff.java
@@ -7,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.
*
@@ -27,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
@@ -74,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
@@ -103,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;
@@ -252,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++)
@@ -285,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++)
@@ -338,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);
}
}
@@ -368,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]);
@@ -377,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;
@@ -389,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
);
@@ -407,11 +422,11 @@ public class Diff {
static class ReverseScript implements ScriptBuilder {
@Override
- public change build_script(
+ 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]) {
@@ -426,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. */
@@ -439,13 +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. */
+ producing an edit script in forward order. */
@Override
- public change build_script(
+ 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)
@@ -463,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. */
@@ -479,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);
}
@@ -493,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,
@@ -546,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. */
@@ -565,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() {
@@ -614,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());
@@ -686,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) {
@@ -703,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;
@@ -743,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) {
@@ -791,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;
@@ -807,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();
}
@@ -837,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;
@@ -851,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++;
@@ -880,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]
@@ -900,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;
@@ -917,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 ad94c89..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();
@@ -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) {
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/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 2097051..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}
/**
@@ -50,7 +55,7 @@ public class Geometry {
int n = ways.size();
@SuppressWarnings("unchecked")
- ArrayList<Node>[] newNodes = new ArrayList[n];
+ List<Node>[] newNodes = new ArrayList[n];
BBox[] wayBounds = new BBox[n];
boolean[] changedWays = new boolean[n];
@@ -73,8 +78,8 @@ public class Geometry {
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 ++) {
@@ -180,7 +185,7 @@ public class Geometry {
for (int pos = 0; pos < ways.size(); pos ++) {
- if (changedWays[pos] == false) {
+ if (!changedWays[pos]) {
continue;
}
@@ -194,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;
@@ -497,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;
@@ -653,12 +658,16 @@ 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++) {
diff --git a/src/org/openstreetmap/josm/tools/I18n.java b/src/org/openstreetmap/josm/tools/I18n.java
index 38c1aad..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.
@@ -475,17 +481,13 @@ public class I18n {
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[]>();
}
@@ -640,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 d0c010a..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,6 +227,7 @@ 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;
@@ -200,6 +237,7 @@ public class ImageProvider {
/**
* 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);
@@ -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;
@@ -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,7 +602,9 @@ 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();
@@ -559,7 +614,7 @@ public class ImageProvider {
}
}
} 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 {
Utils.close(zipFile);
}
@@ -576,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();
@@ -601,6 +658,7 @@ public class ImageProvider {
if ((path != null || f.isAbsolute()) && f.exists())
return f.toURI().toURL();
} catch (MalformedURLException e) {
+ Main.warn(e);
}
}
return null;
@@ -617,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()));
}
@@ -631,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()));
}
@@ -682,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))
@@ -705,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;
}
@@ -771,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();
}
/**
@@ -866,7 +968,7 @@ public class ImageProvider {
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 699019f..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
* 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,11 +47,12 @@ 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);
}
@@ -60,16 +64,16 @@ class ImageResource {
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);
@@ -85,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)
@@ -95,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 fadce5a..c8e964f 100644
--- a/src/org/openstreetmap/josm/tools/InputMapUtils.java
+++ b/src/org/openstreetmap/josm/tools/InputMapUtils.java
@@ -15,34 +15,37 @@ import javax.swing.SwingUtilities;
* 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 0046095..e9abed1 100644
--- a/src/org/openstreetmap/josm/tools/LanguageInfo.java
+++ b/src/org/openstreetmap/josm/tools/LanguageInfo.java
@@ -1,9 +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.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
@@ -17,7 +22,7 @@ public class LanguageInfo {
BASELANGUAGE,
/** The standard english texts */
ENGLISH
- };
+ }
/**
* Replies the wiki language prefix for the given locale. The wiki language
@@ -37,12 +42,12 @@ public class LanguageInfo {
if(type == LocaleType.BASELANGUAGE) {
if(code.matches("[^_]+_[^_]+")) {
code = code.substring(0,2);
- if(code == "en")
+ if ("en".equals(code))
return null;
} else {
return null;
}
- } else if(type == LocaleType.DEFAULTNOTENGLISH && code == "en")
+ } else if(type == LocaleType.DEFAULTNOTENGLISH && "en".equals(code))
return null;
return code.substring(0,1).toUpperCase() + code.substring(1) + ":";
}
@@ -85,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();
}
@@ -117,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/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 9cad7f1..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,8 +19,12 @@ 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."));
@@ -28,11 +32,15 @@ public class OpenBrowser {
}
/**
+ * 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 725a823..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) {
@@ -42,18 +57,14 @@ public class OsmUrlToBounds {
if (map.containsKey("bbox")) {
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));
@@ -148,11 +197,19 @@ public class OsmUrlToBounds {
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;
@@ -191,9 +248,9 @@ public class OsmUrlToBounds {
*/
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) {
@@ -206,29 +263,43 @@ public class OsmUrlToBounds {
}
/**
- * Return OSM URL for given area
+ * Return OSM URL for given area.
*
* @param b bounds of the area
* @return link to display that area in OSM map
*/
- static public String getURL(Bounds b) {
+ public static String getURL(Bounds b) {
return getURL(b.getCenter(), getZoom(b));
}
/**
- * Return OSM URL for given position and 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
*/
- static public String getURL(LatLon pos, int zoom) {
+ 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 9606200..da574cb 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHook.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHook.java
@@ -1,38 +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;
/**
- * 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();
@@ -47,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;
@@ -78,18 +64,35 @@ 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);
/**
diff --git a/src/org/openstreetmap/josm/tools/PlatformHookOsx.java b/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
index 0c5ae9d..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,18 +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")) {
@@ -61,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).
@@ -210,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();
@@ -240,20 +242,15 @@ 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;
}
- /* (non-Javadoc)
- * @see org.openstreetmap.josm.tools.PlatformHookUnixoid#getOSDescription()
- */
@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 96d308b..021839e 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.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.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;
@@ -11,7 +12,11 @@ import java.io.FileReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.Arrays;
-import java.util.List;
+
+import javax.swing.JOptionPane;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.ExtendedDialog;
/**
* see PlatformHook.java
@@ -26,7 +31,7 @@ public class PlatformHookUnixoid implements PlatformHook {
private String osDescription;
@Override
- public void preStartupHook(){
+ public void preStartupHook() {
}
@Override
@@ -41,6 +46,7 @@ public class PlatformHookUnixoid implements PlatformHook {
Runtime.getRuntime().exec(program+" "+url);
return;
} catch (IOException e) {
+ Main.warn(e);
}
}
}
@@ -53,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
@@ -79,15 +86,13 @@ 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);
}
@@ -122,6 +127,7 @@ public class PlatformHookUnixoid implements PlatformHook {
}
}
} catch (IOException e) {
+ Main.warn(e);
}
return null;
}
@@ -259,4 +265,29 @@ public class PlatformHookUnixoid implements PlatformHook {
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 50258fc..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;
@@ -31,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);
@@ -110,22 +123,17 @@ 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);
}
- /* (non-Javadoc)
- * @see org.openstreetmap.josm.tools.PlatformHookUnixoid#getOSDescription()
- */
@Override
public String getOSDescription() {
return Utils.strip(System.getProperty("os.name")) + " " +
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/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 3384e59..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;
@@ -33,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.)
@@ -73,14 +73,6 @@ public class Shortcut {
this.longText = longText;
}
- private int getRequestedKey() {
- return requestedKey;
- }
-
- public int getRequestedGroup() {
- return requestedGroup;
- }
-
public int getAssignedKey() {
return assignedKey;
}
@@ -155,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));
@@ -370,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);
@@ -414,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/TaggingPresetNameTemplateList.java b/src/org/openstreetmap/josm/tools/TaggingPresetNameTemplateList.java
index 80a666a..5ba65a8 100644
--- a/src/org/openstreetmap/josm/tools/TaggingPresetNameTemplateList.java
+++ b/src/org/openstreetmap/josm/tools/TaggingPresetNameTemplateList.java
@@ -14,7 +14,7 @@ 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;
diff --git a/src/org/openstreetmap/josm/tools/TextTagParser.java b/src/org/openstreetmap/josm/tools/TextTagParser.java
index fb06982..8f16a2e 100644
--- a/src/org/openstreetmap/josm/tools/TextTagParser.java
+++ b/src/org/openstreetmap/josm/tools/TextTagParser.java
@@ -8,6 +8,7 @@ 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;
@@ -18,13 +19,14 @@ 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 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);
@@ -32,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;
@@ -109,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 == ' ') {
@@ -234,7 +237,6 @@ public class TextTagParser {
* @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) {
@@ -244,8 +246,9 @@ public class TextTagParser {
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, "tags.paste.keytoolong");
if (r==2 || r==3) return false; if (r==4) return true;
diff --git a/src/org/openstreetmap/josm/tools/Utils.java b/src/org/openstreetmap/josm/tools/Utils.java
index 3650930..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,6 +12,7 @@ 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;
@@ -29,18 +33,26 @@ 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) {
@@ -241,6 +253,32 @@ public class Utils {
}
/**
+ * 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
@@ -300,8 +338,8 @@ public class Utils {
if (c == null) return;
try {
c.close();
- } catch(IOException e) {
- // ignore
+ } catch (IOException e) {
+ Main.warn(e);
}
}
@@ -314,15 +352,21 @@ public class Utils {
if (zip == null) return;
try {
zip.close();
- } catch(IOException e) {
- // ignore
+ } catch (IOException e) {
+ Main.warn(e);
}
}
- private final static double EPSILION = 1e-11;
+ private final static double EPSILON = 1e-11;
+ /**
+ * 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 boolean equalsEpsilon(double a, double b) {
- return Math.abs(a - b) <= EPSILION;
+ return Math.abs(a - b) <= EPSILON;
}
/**
@@ -360,6 +404,7 @@ public class Utils {
try {
Thread.sleep(1);
} catch (InterruptedException ex) {
+ Main.warn("InterruptedException in "+Utils.class.getSimpleName()+" while getting clipboard content");
}
}
}
@@ -400,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
@@ -408,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);
}
@@ -573,6 +629,7 @@ public class Utils {
}
HttpURLConnection connection = (HttpURLConnection) httpURL.openConnection();
connection.setRequestProperty("User-Agent", Version.getInstance().getFullAgentString());
+ connection.setUseCaches(false);
return connection;
}
@@ -584,7 +641,27 @@ public class Utils {
* @since 5867
*/
public static InputStream openURL(URL url) throws IOException {
- return setupURLConnection(url.openConnection()).getInputStream();
+ 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();
+ }
}
/***
@@ -610,13 +687,26 @@ public class Utils {
* @since 5868
*/
public static BufferedReader openURLReader(URL url) throws IOException {
- return new BufferedReader(new InputStreamReader(openURL(url), "utf-8"));
+ 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
@@ -647,7 +737,8 @@ public class Utils {
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)
- leadingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c) || c == '\u200B');
+ // same for '\uFEFF' (ZERO WIDTH NO-BREAK SPACE)
+ leadingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c) || c == '\u200B' || c == '\uFEFF');
if (leadingWhite) {
start++;
}
@@ -655,7 +746,7 @@ public class Utils {
boolean trailingWhite = true;
while (trailingWhite && end > start+1) {
char c = str.charAt(end-1);
- trailingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c) || c == '\u200B');
+ trailingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c) || c == '\u200B' || c == '\uFEFF');
if (trailingWhite) {
end--;
}
@@ -689,4 +780,53 @@ public class Utils {
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 be97c23..0dff73b 100644
--- a/src/org/openstreetmap/josm/tools/WikiReader.java
+++ b/src/org/openstreetmap/josm/tools/WikiReader.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.io.BufferedReader;
@@ -21,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);
}
/**
@@ -85,10 +88,10 @@ public class WikiReader {
}
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>";
diff --git a/src/org/openstreetmap/josm/tools/XmlObjectParser.java b/src/org/openstreetmap/josm/tools/XmlObjectParser.java
index e060da4..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,6 +24,7 @@ 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;
@@ -44,6 +46,9 @@ public class XmlObjectParser implements Iterable<Object> {
private int columnNumber;
private int lineNumber;
+ /**
+ * Constructs a new {@code PresetParsingException}.
+ */
public PresetParsingException() {
super();
}
@@ -172,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 += "_";
}
@@ -274,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() {
@@ -297,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 cba4a3e..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>
@@ -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"/>
@@ -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>
@@ -1279,7 +1290,7 @@ For external files the <rules> should have following elements:
<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"/>
@@ -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>
@@ -1815,6 +1826,12 @@ For external files the <rules> should have following elements:
<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"/>
@@ -2494,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"/>
@@ -2843,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>
@@ -2949,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>
@@ -2998,6 +3026,12 @@ 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"/>
@@ -3068,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>
@@ -3704,6 +3756,16 @@ For external files the <rules> should have following elements:
</rule>
<rule>
+ <condition k="building" v="garage"/>
+ <icon annotate="true" src="misc/landuse/garages.png"/>
+ </rule>
+
+ <rule>
+ <condition k="building" v="garages"/>
+ <icon annotate="true" src="misc/landuse/garages.png"/>
+ </rule>
+
+ <rule>
<condition k="building" v="entrance" />
<icon annotate="true" src="misc/entrance-yes.png" priority="100"/>
</rule>
@@ -3826,6 +3888,7 @@ For external files the <rules> should have following elements:
<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>
@@ -3833,6 +3896,7 @@ For external files the <rules> should have following elements:
<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>
@@ -3840,6 +3904,7 @@ For external files the <rules> should have following elements:
<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>
@@ -3847,6 +3912,7 @@ For external files the <rules> should have following elements:
<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>
@@ -3854,12 +3920,14 @@ For external files the <rules> should have following elements:
<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 -->
@@ -3882,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
index 409c1be..9385853 100644
--- a/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java
+++ b/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java
@@ -18,7 +18,7 @@ public class ReverseWayTagCorrectorTest {
*/
@BeforeClass
public static void setUp() {
- Main.pref = new Preferences();
+ Main.initApplicationPreferences();
}
/**
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
index 018f5e8..7fe7b83 100644
--- a/test/unit/org/openstreetmap/josm/gui/SystemOfMeasurementTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/SystemOfMeasurementTest.java
@@ -8,6 +8,10 @@ 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.
*/
@@ -18,7 +22,7 @@ public class SystemOfMeasurementTest {
*/
@BeforeClass
public static void setUp() {
- Main.pref = new Preferences();
+ Main.initApplicationPreferences();
}
/**
@@ -62,6 +66,16 @@ public class SystemOfMeasurementTest {
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.
*/
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
index 98d3033..5e9d36c 100644
--- a/test/unit/org/openstreetmap/josm/tools/UtilsTest.java
+++ b/test/unit/org/openstreetmap/josm/tools/UtilsTest.java
@@ -3,6 +3,11 @@ 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.
@@ -30,6 +35,7 @@ public class UtilsTest {
"\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(""));
@@ -50,4 +56,34 @@ public class UtilsTest {
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