Commit 30f3218e authored by Bas Couwenberg's avatar Bas Couwenberg

Imported Upstream version 0.0.svn9329+dfsg

parent 9f1f6c49
......@@ -53,10 +53,10 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=enabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
......@@ -76,7 +76,7 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
......
......@@ -3,7 +3,7 @@
<entry
kind="dir"
path="trunk"
revision="9229">
revision="9329">
<url>https://josm.openstreetmap.de/svn/trunk</url>
<relative-url>^/trunk</relative-url>
<repository>
......@@ -11,9 +11,9 @@
<uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
</repository>
<commit
revision="9229">
revision="9329">
<author>Don-vip</author>
<date>2015-12-31T12:54:58.747487Z</date>
<date>2016-01-06T16:30:31.947597Z</date>
</commit>
</entry>
</info>
......@@ -275,6 +275,7 @@ Build-Date: ${build.tstamp}
sourcepath="${src.dir}"
encoding="UTF-8"
packagenames="org.openstreetmap.josm.*,org.openstreetmap.gui.jmapviewer.*"
excludepackagenames="org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.*"
windowtitle="JOSM"
use="true"
private="true"
......@@ -600,17 +601,17 @@ Build-Date: ${build.tstamp}
<taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${groovy.jar};tools/commons-cli-1.3.1.jar"/>
<property name="taginfoextract" value="scripts/taginfoextract.groovy"/>
<property name="imgurlprefix" value="http://josm.openstreetmap.de/download/taginfo/taginfo-img"/>
<_taginfo type="mappaint" output="taginfo_style.json"/>
<_taginfo type="presets" output="taginfo_presets.json"/>
<_taginfo type="external_presets" output="taginfo_external_presets.json"/>
<_taginfo type="mappaint" output="taginfo_style.json"/>
<_taginfo type="presets" output="taginfo_presets.json"/>
<_taginfo type="external_presets" output="taginfo_external_presets.json"/>
</target>
<target name="checkstyle">
<taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
classpath="tools/checkstyle/checkstyle-6.14-all.jar"/>
classpath="tools/checkstyle/checkstyle-6.14.1-all.jar"/>
<checkstyle config="tools/checkstyle/josm_checks.xml">
<fileset dir="${basedir}/src/org/openstreetmap/josm" includes="**/*.java"
excludes="gui/mappaint/mapcss/parsergen/*.java"/>
excludes="gui/mappaint/mapcss/parsergen/*.java"/>
<fileset dir="${basedir}/test" includes="**/*.java"/>
<formatter type="xml" toFile="checkstyle-josm.xml"/>
</checkstyle>
......
This diff is collapsed.
......@@ -135,6 +135,7 @@ K:building=public
K:building=houseboat
K:building=static_caravan
K:leisure=recreation_ground
K:old_railway_operator=PRR
;
; Highway Key/Value Pairs
;
......@@ -255,3 +256,18 @@ K:tourism=yes
K:type=collection
K:type=tmc
K:type=TMC
;
; Tags not yet decided (to remove from this section when added or deprecated)
; see https://josm.openstreetmap.de/ticket/12240
; see https://josm.openstreetmap.de/ticket/11915
; see https://josm.openstreetmap.de/ticket/10991
; see https://josm.openstreetmap.de/ticket/10759
;
K:golf=bunker
K:golf=fairway
K:maintenance=gritting
K:man_made=mast
K:man_made=silo
K:power=portal
K:route=foot
K:seasonal=yes
B嘀汁潬獷琠敨甠敳⁲潴愠潮祮業敳琠浩獥慴灭⁳湡⁤敤敬整瀠牡獴漠⁦畨敧䜠塐琠慲正⁳敶祲映獡⹴ँ汁潬獷琠敨甠敳⁲潴挠敲瑡⁥楤晦牥湥⁴潣潬牵猠档浥獥愠摮琠睳瑩档戠瑥敷湥琠敨⹭䨠獵⁴档湡敧琠敨挠汯畯獲愠摮挠敲瑡⁥⁡敮⁷捳敨敭‮獕摥琠睳瑩档琠⁡桷瑩⁥慢正牧畯摮眠瑩⁨慭捴楨杮挠汯畯獲映牯戠瑥整⁲楶楳楢楬祴椠牢杩瑨猠湵楬桧⹴匠敥搠慩潬畧⁥湩搠獩汰祡瀠敲敦敲据獥N￾￾￾￾￾￾þ䆴潮桴牥瀠畬ⵧ湩琠慭捴⁨浩条獥琠桴⁥慷灹楯瑮⁳湩愠䜠塐映汩⹥䄠洠瑡档椠⁳慭敤眠敨桴⁥✧慮敭✧‬✧浣❴‧牯✠搧獥❣‧瑡牴扩瑵⁥景愠眠祡潰湩⁴慴⁧慭捴敨⁳桴⁥楦敬慮敭漠⁦湡椠慭敧N￾￾￾￾￾￾￾￾￾￾￾￾￾þ䔷慮汢獥猠慥捲楨杮映牯眠祡潰湩獴椠灭牯整⁤牦浯朠硰映汩⹥⼀敇敮慲整椠慭敧祲堠䱍戠畯摮⁳牦浯愠洠汵楴潰祬潧n䞘潲灵挠浯潭摁牤獥⁳湉整灲汯瑡潩湩異獴椠⁡楳杮敬搠慩潬畧ⱥ愠⁳敷汬愠⁳湡漠瑰潩潴愠瑵浯瑡捩污祬朠湥牥瑡⁥湩楤楶畤污栠畯敳渠浵敢⁲潮敤⁳牦浯愠圠祡Nþ䠝汥獰瘠捥潴楲楳杮圠卍椠慭敧⹳℀汐杵湩琠楤楧慴汬⁹楳湧传䵓䐭瑡a僈潲楶敤愠洠慥畳敲敭瑮搠慩潬畧⁥湡⁤⁡慬敹⁲潴洠慥畳敲氠湥瑧⁨湡⁤湡汧⁥景猠来敭瑮ⱳ愠敲⁡畳牲畯摮摥戠⁹⁡猨浩汰⥥挠潬敳⁤慷⁹湡⁤牣慥整洠慥畳敲敭瑮瀠瑡獨⠠桷捩⁨污潳挠湡戠⁥浩潰瑲摥映潲⁡灧⁳慬敹⥲N￾￾￾þ倷潲楶敤⁳⁡楤污杯敵映牯攠楤楴杮琠条⁳湩愠琠扡汵牡朠楲⹤脀畓灰牯獴搠睯汮慯楤杮琠汩摥‬捳湡敮⁤慭獰映潲慷歬湩ⵧ慰数獲漮杲‮桔獩瀠畬ⵧ湩椠⁳瑳汩湵敤⁲慥汲⁹敤敶潬浰湥⁴湡⁤慭⁹敢戠杵祧Nþ咖敨䴠灡畄瑳倠畬ⵧ湉猠潨獷琠敨䴠灡畄瑳戠杵爠灥牯獴漠桴⁥慭⹰夠畯挠湡挠敲瑡ⱥ挠潬敳‬湩慶楬慤整‬敲漭数湡⁤潣浭湥⁴畢⁧敲潰瑲⁳祢甠楳杮琠楨⁳汰杵湩N￾￾þ呣楨⁳汰杵椭污潬獷琠楤灳慬⁹湡⁹楰瑣牵⁥獡愠戠捡杫潲湵⁤湩琠敨攠楤潴⁲湡⁤污杩瑩眠瑩⁨桴⁥慭⹰开桔獩瀠畬ⵧ湩搠物捥汴⁹灵潬摡䜠卐吠慲散⁳牦浯挠牵敲瑮愠瑣癩⁥慬敹⁲湩䨠协⁍潴漠数獮牴敥浴灡漮杲.呋楨⁳汰杵椭楳灭楬楦獥琠敨洠灡楰杮愠摮攠楤楴杮漠⁦異汢捩琠慲獮潰瑲爠畯整⹳㈀楖畳污獩獥爠畯楴杮椠普牯慭楴湯愠⁳⁡潲瑵湩⁧牧灡⹨￿
......@@ -41,7 +41,7 @@
<copy file="specialmessages.java" todir="${i18n.build.dir}"/>
</target>
<target name="po/josm.pot" description="Extracts message keys from the source code" depends="trans_.java,init">
<gettext-extract keysFile="josm.pot" poDirectory="po" keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
<gettext-extract keysFile="josm.raw.pot" poDirectory="po" keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
<fileset dir="${josm.build.dir}/src" includes="**/*.java"/>
<fileset dir="${i18n.build.dir}" includes="specialmessages.java"/>
<fileset dir="${i18n.build.dir}" includes="trans_*.java"/>
......@@ -50,6 +50,10 @@
<fileset dir="${josm.build.dir}/styles/standard" includes="*.mapcss"/>
<fileset dir="${plugin.dir}" includes="**/*.java"/>
</gettext-extract>
<exec executable="msggrep" failonerror="true">
<arg line="--msgid --regexp='---DUMMY-MARKER---' --invert-match --output-file=po/josm.pot po/josm.raw.pot"/>
</exec>
<delete file="po/josm.raw.pot"/>
</target>
<target name="po/core.pot" description="Extracts message keys from the JOSM core source code" depends="trans_.java,init">
<gettext-extract keysFile="core.pot" poDirectory="po" keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
......@@ -93,8 +97,10 @@
<delete file="${po.build.dir}/plugins.raw.pot"/>
</target>
<target name="build" depends="pot,allpot">
<antcall target="coretrans"/>
<antcall target="datatrans"/>
<antcall target="buildcore"/>
<antcall target="buildplugins"/>
</target>
<target name="buildplugins" depends="init">
<foreach param="path" target="plugintrans">
<path>
<dirset dir="${plugin.dir}" includes="*" excludes="00_*" />
......
......@@ -33,7 +33,7 @@ for my $line (@lines)
{
$line =~ s/\r//g;
chomp($line);
print "tr(\"\"); ";
print "tr(\"---DUMMY-MARKER---\"); ";
if($line =~ /<name(?: +lang=['"]en['"])?>(.*)<\/name>/)
{
my $val = $1;
......
......@@ -35,7 +35,7 @@ while(my $line = <>)
{
++$linenr;
chomp($line);
print "tr(\"\"); ";
print "tr(\"---DUMMY-MARKER---\"); ";
if($line =~ /<item\s+name=(".*?")/)
{
my $val = fix($1);
......
......@@ -17,7 +17,7 @@ print "class trans_style { void tr(String s){} void f() {";
while(my $line = <>)
{
chomp($line);
print "tr(\"\"); ";
print "tr(\"---DUMMY-MARKER---\"); ";
if($line =~ /<rules\s+name=(".*?")/)
{
print "/* mappaint style named $1 */ tr($1);\n";
......
......@@ -18,7 +18,7 @@ print "class trans_surveyor { void tr(String s){} void f() {";
while(my $line = <>)
{
chomp($line);
print "tr(\"\"); ";
print "tr(\"---DUMMY-MARKER---\"); ";
if($line =~ /^#(.*)$/)
{
print "/* $1 */\n";
......
......@@ -398,7 +398,7 @@ sub createlang($@)
}
else
{
printf "Created file %-${maxlen}s: Added %5d strings out of %5d (%5.1f%%).\n",$file,$cnt,$maxcount,,$cnt*100.0/$maxcount;
printf "Created file %-${maxlen}s: Added %5d strings out of %5d (%5.1f%%).\n",$file,$cnt,$maxcount,,$cnt*100.0/$maxcount-5e-2;
}
}
}
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-12-31 03:40+0100\n"
"POT-Creation-Date: 2016-01-06 03:38+0100\n"
"PO-Revision-Date: 2011-10-13 02:39+0000\n"
"Last-Translator: Grant Slater <Unknown>\n"
"Language-Team: Afrikaans <af@li.org>\n"
......@@ -15,8 +15,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: 2015-12-31 04:31+0000\n"
"X-Generator: Launchpad (build 17865)\n"
"X-Launchpad-Export-Date: 2016-01-06 04:31+0000\n"
"X-Generator: Launchpad (build 17876)\n"
"Language: af\n"
msgid "{0}: option ''{1}'' is ambiguous"
......@@ -1056,9 +1056,6 @@ msgstr ""
msgid "Overpass query: "
msgstr ""
msgid "Overpass server: "
msgstr ""
msgid "Paste"
msgstr ""
......@@ -1348,6 +1345,9 @@ msgstr ""
msgid "Split a way at the selected node."
msgstr ""
msgid "Cannot split since another split operation is already in progress"
msgstr ""
msgid ""
"The current selection cannot be used for splitting - no node is selected."
msgstr ""
......@@ -1459,6 +1459,27 @@ msgid ""
"own copy and all nodes will be selected."
msgstr ""
msgid "Existing node"
msgstr ""
msgid "Both nodes"
msgstr ""
msgid "New node"
msgstr ""
msgid "Tags / Memberships"
msgstr ""
msgid "Unglue"
msgstr ""
msgid "Where should the tags of the node be put?"
msgstr ""
msgid "Where should the memberships of this node be put?"
msgstr ""
msgid "Unglued Node"
msgstr ""
......@@ -3049,6 +3070,15 @@ msgstr ""
msgid "Restoring files"
msgstr ""
msgid "Unable to delete backup file {0}"
msgstr ""
msgid "Unable to delete PID file {0}"
msgstr ""
msgid "Unable to delete archived backup file {0}"
msgstr ""
msgid "Illegal latitude value ''{0}''"
msgstr ""
......@@ -4207,6 +4237,9 @@ msgstr ""
msgid "No \"to\" way found"
msgstr ""
msgid "\"from\" way equals \"to\" way"
msgstr ""
msgid "No \"via\" node or way found"
msgstr ""
......@@ -7004,9 +7037,6 @@ msgstr ""
msgid "Tags: {0} / Memberships: {1}"
msgstr ""
msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
......@@ -11611,6 +11641,15 @@ msgstr ""
msgid "Please enter the OSM API URL."
msgstr ""
msgid "Use Overpass server for object downloads"
msgstr ""
msgid "Overpass server: "
msgstr ""
msgid "Overpass server"
msgstr ""
msgid "Proxy settings"
msgstr ""
......@@ -13749,6 +13788,9 @@ msgstr ""
msgid "reserved"
msgstr ""
msgid "Unable to delete old preferences file {0}"
msgstr ""
msgid "Outdated Java version"
msgstr ""
......@@ -13840,6 +13882,9 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
msgid "Unable to delete file {0}"
msgstr ""
msgid "ms"
msgstr ""
......@@ -16954,6 +16999,9 @@ msgstr ""
msgid "Tourist buses"
msgstr ""
msgid "Max. speed Heavy Goods Vehicles (km/h)"
msgstr ""
msgid "Min. speed (km/h)"
msgstr ""
......@@ -19251,12 +19299,6 @@ msgstr ""
msgid "Dentist"
msgstr ""
msgid "Nursing Home"
msgstr ""
msgid "Retirement Home"
msgstr ""
msgid "Pharmacy"
msgstr ""
......@@ -19284,6 +19326,31 @@ msgstr ""
msgid "Veterinary"
msgstr ""
msgid "Social Facility"
msgstr ""
msgid "Nursing Home"
msgstr ""
msgid "Group Home"
msgstr ""
msgid "For"
msgstr ""
msgid "Assisted Living"
msgstr ""
msgid "Outreach"
msgstr ""
msgctxt "social_facility"
msgid "Shelter"
msgstr ""
msgid "Food Bank"
msgstr ""
msgid "Toilets/Restrooms"
msgstr ""
......@@ -19326,6 +19393,13 @@ msgstr ""
msgid "urinal"
msgstr ""
msgctxt "toilets"
msgid "Diaper"
msgstr ""
msgid "room"
msgstr ""
msgid "Post Box"
msgstr ""
......@@ -23363,24 +23437,24 @@ msgstr ""
msgid "Download GPX track from openstreetmap.org"
msgstr ""
msgid "Download Track"
msgstr ""
msgid "Filename"
msgstr ""
msgid ""
"Error occurred while parsing gpx file {0}. Only a part of the file will be "
"available."
msgstr ""
msgid "Invalid URL {0}"
msgstr ""
msgid "Error fetching URL {0}"
msgstr ""
msgid "Error parsing data from URL {0}"
msgstr ""
msgid "Download Track"
msgstr ""
msgid "Filename"
msgid "Invalid URL {0}"
msgstr ""
msgid "Private (only shared as anonymous, unordered points)"
......@@ -23430,9 +23504,6 @@ msgstr ""
msgid "Uploading trace ..."
msgstr ""
msgid "Connecting..."
msgstr ""
msgid "Upload canceled"
msgstr ""
......@@ -27871,6 +27942,69 @@ msgstr ""
msgid "Please load some photos."
msgstr ""
msgid "Edit photo GPS data"
msgstr ""
msgid "Edit GPS data of selected photo."
msgstr ""
msgid "Edit Photo GPS Data"
msgstr ""
msgid "Please select an image first."
msgstr ""
msgid "No image selected"
msgstr ""
msgid "(Empty values delete the according fields.)"
msgstr ""
msgid "coordinates"
msgstr ""
msgid "Latitude and longitude"
msgstr ""
msgid "Edit Image Coordinates"
msgstr ""
msgid "Edit coordinates in separate editor"
msgstr ""
msgid "altitude"
msgstr ""
msgid "Altitude:"
msgstr ""
msgid "speed"
msgstr ""
msgid "positive number or empty"
msgstr ""
msgid "Speed:"
msgstr ""
msgid "direction"
msgstr ""
msgid "range -360.0 .. 360.0, or empty"
msgstr ""
msgid "Direction:"
msgstr ""
msgid "°"
msgstr ""
msgid "Undo changes made in this dialog"
msgstr ""
msgid "Reload GPS data from image file"
msgstr ""
msgid "New layer for untagged images"
msgstr ""
......@@ -30887,9 +31021,6 @@ msgstr ""
msgid "Fetches all coordinates from Wikipedia in the current view"
msgstr ""
msgid "coordinates"
msgstr ""
msgid "Category"
msgstr ""
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-12-31 03:40+0100\n"
"POT-Creation-Date: 2016-01-06 03:38+0100\n"
"PO-Revision-Date: 2010-03-30 12:09+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Amharic <am@li.org>\n"
......@@ -15,8 +15,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: 2015-12-31 04:32+0000\n"
"X-Generator: Launchpad (build 17865)\n"
"X-Launchpad-Export-Date: 2016-01-06 04:31+0000\n"
"X-Generator: Launchpad (build 17876)\n"
"Language: am\n"
msgid "{0}: option ''{1}'' is ambiguous"
......@@ -1056,9 +1056,6 @@ msgstr ""
msgid "Overpass query: "
msgstr ""
msgid "Overpass server: "
msgstr ""
msgid "Paste"
msgstr ""
......@@ -1348,6 +1345,9 @@ msgstr ""
msgid "Split a way at the selected node."