Commit 17e6e15b authored by Bas Couwenberg's avatar Bas Couwenberg

Imported Upstream version 0.0.svn9963+dfsg

parent 428e590a
......@@ -17,7 +17,7 @@
<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="lib" path="test/lib/equalsverifier-1.7.6.jar"/>
<classpathentry kind="lib" path="test/lib/equalsverifier-2.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_80"/>
<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
<classpathentry kind="lib" path="test/lib/unitils-core/commons-collections-3.2.jar"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<info>
<entry
revision="9963"
kind="dir"
path="trunk"
revision="9900">
path="trunk">
<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="9900">
revision="9963">
<author>Don-vip</author>
<date>2016-02-28T13:07:49.957141Z</date>
<date>2016-03-11T20:05:43.624013Z</date>
</commit>
</entry>
</info>
......@@ -651,7 +651,7 @@ Build-Date: ${build.tstamp}
<target name="checkstyle" depends="init-properties">
<taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
classpath="tools/checkstyle/checkstyle-6.15-all.jar"/>
classpath="tools/checkstyle/checkstyle-6.16.1-all.jar"/>
<checkstyle config="tools/checkstyle/josm_checks.xml">
<fileset dir="${base.dir}/src/org/openstreetmap/josm" includes="**/*.java"
excludes="gui/mappaint/mapcss/parsergen/*.java"/>
......
......@@ -380,6 +380,15 @@
<preset_link preset_name="Addresses" />
<preset_link preset_name="Payment Methods" />
</chunk>
<chunk id="public_transport_route_optionals">
<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" />
</chunk>
<!-- Groups -->
<group name="Highways" icon="styles/standard/transport/way/way_secondary.svg">
<group name="Streets" icon="styles/standard/transport/way/way_secondary.svg">
......@@ -3068,32 +3077,46 @@
</item> <!-- Public Bicycle Repair Station -->
</group> <!-- Bicycle -->
<group name="Public Transport" icon="presets/bus.png">
<item name="Public Transport Route" icon="presets/path.png" type="relation" preset_name_label="true">
<item name="Public Transport Route (Rail)" icon="presets/path.png" type="relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route" />
<space />
<key key="type" value="route" />
<combo key="route" text="Route type" values="train,subway,monorail,tram,light_rail,bus,trolleybus,aerialway,ferry" values_searchable="true" match="keyvalue!" />
<combo key="route" text="Route type" values="train,subway,monorail,tram,light_rail" values_searchable="true" match="keyvalue!" />
<key key="public_transport:version" value="2" /> <!-- only validate marked relations in order to avoid false positives -->
<reference ref="name_ref" />
<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" />
<combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
<reference ref="public_transport_route_optionals" />
</optional>
<roles>
<role key="stop" text="stop position" requisite="optional" type="node" member_expression="public_transport=stop_position (train=yes OR subway=yes OR monorail=yes OR tram=yes OR light_rail=yes)" />
<role key="stop_exit_only" text="stop position (exit only)" requisite="optional" type="node" member_expression="public_transport=stop_position (train=yes OR subway=yes OR monorail=yes OR tram=yes OR light_rail=yes)" />
<role key="stop_entry_only" text="stop position (entry only)" requisite="optional" type="node" member_expression="public_transport=stop_position (train=yes OR subway=yes OR monorail=yes OR tram=yes OR light_rail=yes)" />
<role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform (train=yes OR subway=yes OR monorail=yes OR tram=yes OR light_rail=yes)" />
<role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform (train=yes OR subway=yes OR monorail=yes OR tram=yes OR light_rail=yes)" />
<role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform (train=yes OR subway=yes OR monorail=yes OR tram=yes OR light_rail=yes)" />
<role key="" text="route segment" requisite="required" type="way,closedway" member_expression="railway" />
</roles>
</item> <!-- Public Transport Route (Rail) -->
<item name="Public Transport Route (Bus)" icon="presets/path.png" type="relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route" />
<space />
<key key="type" value="route" />
<combo key="route" text="Route type" values="bus,trolleybus" values_searchable="true" match="keyvalue!" />
<key key="public_transport:version" value="2" /> <!-- only validate marked relations in order to avoid false positives -->
<reference ref="name_ref" />
<optional>
<reference ref="public_transport_route_optionals" />
</optional>
<roles>
<role key="stop" text="stop position" requisite="optional" type="node" member_expression="public_transport=stop_position" />
<role key="stop_exit_only" text="stop position (exit only)" requisite="optional" type="node" member_expression="public_transport=stop_position" />
<role key="stop_entry_only" text="stop position (entry only)" requisite="optional" type="node" member_expression="public_transport=stop_position" />
<role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
<role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
<role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
<role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway OR railway OR waterway OR aerialway" />
<role key="stop" text="stop position" requisite="optional" type="node" member_expression="public_transport=stop_position (bus=yes OR trolleybus=yes)" />
<role key="stop_exit_only" text="stop position (exit only)" requisite="optional" type="node" member_expression="public_transport=stop_position (bus=yes OR trolleybus=yes)" />
<role key="stop_entry_only" text="stop position (entry only)" requisite="optional" type="node" member_expression="public_transport=stop_position (bus=yes OR trolleybus=yes)" />
<role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform (bus=yes OR trolleybus=yes)" />
<role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform (bus=yes OR trolleybus=yes)" />
<role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform (bus=yes OR trolleybus=yes)" />
<role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway" />
</roles>
</item> <!-- Public Transport Route -->
</item> <!-- Public Transport Route (Bus) -->
<item name="Route Master" icon="presets/path.png" type="relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route_master" />
<space />
......
@CHARSET "ISO-8859-1";
/*
* This is the CSS file used in the internal help browser
*/
body {margin-left: 0.2cm; font-family: Arial, sans-serif; font-size:14pt; font-weight:normal}
p {margin-top: 5px; margin-bottom: 5px;}
h1 {font-family: Arial, sans-serif; font-size:24pt; font-weight:bold}
h2 {margin-top: 14pt; font-family: Arial, sans-serif; font-size:20pt; font-weight:bold}
h3 {margin-top: 14pt; font-family: Arial, sans-serif; font-size:16pt; font-weight:bold}
h4 {margin-top: 14pt; font-family: Arial, sans-serif; font-size:14pt; font-weight:bold}
a {font-family: Arial, sans-serif; font-size:14pt; font-weight:normal; text-decoration: underline; color: blue}
ul {margin-left: 1cm; list-style-type: disc}
ul ul {margin-left: 1cm; list-style-type: circle}
ol {margin-left: 1cm;}
strong {font-weight: bold}
b {font-weight: bold}
em {font-style: italic}
i {font-style: italic}
tt {font-family: Courier New}
pre {font-family: Courier New}
.warning-header {
font-family: Arial, sans-serif;
font-size:24pt;
font-weight:bold
}
.warning-body {
background-color:rgb(253,255,221);
padding: 10pt;
border-color:rgb(128,128,128);
border-style: solid;
border-width: 1px;
}
.error-header {
font-family: Arial, sans-serif;
font-size:24pt;
font-weight:bold
}
.error-body {
background-color:rgb(254,195,190);
padding: 10pt;
border-color:rgb(128,128,128);
border-style: solid;
border-width: 1px;
@CHARSET "ISO-8859-1";
/*
* This is the CSS file used in the internal help browser
*/
body {margin-left: 0.2cm; font-family: Arial, sans-serif; font-size:14pt; font-weight:normal}
p {margin-top: 5px; margin-bottom: 5px;}
h1 {font-family: Arial, sans-serif; font-size:24pt; font-weight:bold}
h2 {margin-top: 14pt; font-family: Arial, sans-serif; font-size:20pt; font-weight:bold}
h3 {margin-top: 14pt; font-family: Arial, sans-serif; font-size:16pt; font-weight:bold}
h4 {margin-top: 14pt; font-family: Arial, sans-serif; font-size:14pt; font-weight:bold}
a {font-family: Arial, sans-serif; font-size:14pt; font-weight:normal; text-decoration: underline; color: blue}
ul {margin-left: 1cm; list-style-type: disc}
ul ul {margin-left: 1cm; list-style-type: circle}
ol {margin-left: 1cm;}
strong {font-weight: bold}
b {font-weight: bold}
em {font-style: italic}
i {font-style: italic}
tt {font-family: Courier New}
pre {font-family: Courier New}
.warning-header {
font-family: Arial, sans-serif;
font-size:24pt;
font-weight:bold
}
.warning-body {
background-color:rgb(253,255,221);
padding: 10pt;
border-color:rgb(128,128,128);
border-style: solid;
border-width: 1px;
}
.error-header {
font-family: Arial, sans-serif;
font-size:24pt;
font-weight:bold
}
.error-body {
background-color:rgb(254,195,190);
padding: 10pt;
border-color:rgb(128,128,128);
border-style: solid;
border-width: 1px;
}
\ No newline at end of file
......@@ -92,7 +92,6 @@ way[junction ][!highway][junction!=yes],
}
/* {0.key} without {1.tag} */
*[substation ][power!=substation],
*[transformer ][!power],
*[fence_type ][barrier!=fence],
*[recycling_type ][amenity!=recycling],
......@@ -104,7 +103,6 @@ way[junction ][!highway][junction!=yes],
*[site_type ][historic!=archaeological_site],
*[artwork_type ][tourism!=artwork],
*[castle_type ][historic!=castle],
*[reservoir_type ][landuse!=reservoir][water!=reservoir],
*[bridge:movable ][bridge!=movable],
*[parking ][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking)$/],
*[cutline ][man_made!=cutline],
......@@ -112,6 +110,12 @@ way[junction ][!highway][junction!=yes],
throwWarning: tr("{0} without {1}", "{0.key}", "{1.tag}");
}
/* {0.key} without {1.tag} or {2.tag} */
*[substation ][power!=substation][pipeline!=substation],
*[reservoir_type ][landuse!=reservoir][water!=reservoir] {
throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.tag}", "{2.tag}");
}
/* {0.tag} without {1.key} (warning level) */
*[tourism=information][!information],
*[aeroway=terminal][!building],
......
This diff is collapsed.
<?xml version='1.0' encoding='UTF-8'?>
<osm version='0.3' generator='JOSM'>
</osm>
<?xml version='1.0' encoding='UTF-8'?>
<osm version='0.3' generator='JOSM'>
</osm>
......@@ -417,3 +417,10 @@
<6811> +proj=omerc +lat_0=45.91666666666666 +lonc=-123 +alpha=295 +k=1 +x_0=7000000.00000248 +y_0=-2999999.999988 +no_uoff +gamma=295 +ellps=GRS80 +units=ft +no_defs +bounds=-125,45,-121,47 <>
# NAD83(2011) / Oregon Columbia River West zone (m)
<6810> +proj=omerc +lat_0=45.91666666666666 +lonc=-123 +alpha=295 +k=1 +x_0=7000000 +y_0=-3000000 +no_uoff +gamma=295 +ellps=GRS80 +units=m +no_defs +bounds=-125,45,-121,47 <>
##
## Following entries use Sinusoidal projection
##
# ESRI:53008 / Sphere Sinusoidal
<53008> +proj=sinu +lon_0=0 +x_0=0 +y_0=0 +a=6371000 +b=6371000 +units=m +no_defs <>
# ESRI:54008 / World Sinusoidal
<54008> +proj=sinu +lon_0=0 +x_0=0 +y_0=0 +datum=WGS84 +units=m +no_defs <>
......@@ -18940,3 +18940,11 @@ EPSG:7645
ll -7.287777357194264 -99.21276976541854
en -4112844.748691825 -2.0612730742246613E7
ll2 -7.287777357194223 -99.21276976541854
EPSG:53008
ll 58.982194186686854 -88.06214048573408
en -5045893.591670716 6558520.755923763
ll2 58.982194186686850 -88.06214048573406
EPSG:54008
ll 58.982194186686854 -88.06214048573408
en -5064010.776136052 6540685.607089906
ll2 58.982194186686850 -88.06214048573408
B嘀汁潬獷琠敨甠敳⁲潴愠潮祮業敳琠浩獥慴灭⁳湡⁤敤敬整瀠牡獴漠⁦畨敧䜠塐琠慲正⁳敶祲映獡⹴ँ汁潬獷琠敨甠敳⁲潴挠敲瑡⁥楤晦牥湥⁴潣潬牵猠档浥獥愠摮琠睳瑩档戠瑥敷湥琠敨⹭䨠獵⁴档湡敧琠敨挠汯畯獲愠摮挠敲瑡⁥⁡敮⁷捳敨敭‮獕摥琠睳瑩档琠⁡桷瑩⁥慢正牧畯摮眠瑩⁨慭捴楨杮挠汯畯獲映牯戠瑥整⁲楶楳楢楬祴椠牢杩瑨猠湵楬桧⹴匠敥搠慩潬畧⁥湩搠獩汰祡瀠敲敦敲据獥N￾￾￾￾￾￾þ䆴潮桴牥瀠畬ⵧ湩琠慭捴⁨浩条獥琠桴⁥慷灹楯瑮⁳湩愠䜠塐映汩⹥䄠洠瑡档椠⁳慭敤眠敨桴⁥✧慮敭✧‬✧浣❴‧牯✠搧獥❣‧瑡牴扩瑵⁥景愠眠祡潰湩⁴慴⁧慭捴敨⁳桴⁥楦敬慮敭漠⁦湡椠慭敧N￾￾￾þ䌨獵潴業慳楴湯漠⁦異汢捩琠慲獮潰瑲猠潴獰N￾￾￾￾￾￾￾￾￾þ䔷慮汢獥猠慥捲楨杮映牯眠祡潰湩獴椠灭牯整⁤牦浯朠硰映汩⹥⼀敇敮慲整椠慭敧祲堠䱍戠畯摮⁳牦浯愠洠汵楴潰祬潧n䞘潲灵挠浯潭摁牤獥⁳湉整灲汯瑡潩湩異獴椠⁡楳杮敬搠慩潬畧ⱥ愠⁳敷汬愠⁳湡漠瑰潩潴愠瑵浯瑡捩污祬朠湥牥瑡⁥湩楤楶畤污栠畯敳渠浵敢⁲潮敤⁳牦浯愠圠祡Nþ䠝汥獰瘠捥潴楲楳杮圠卍椠慭敧⹳℀汐杵湩琠楤楧慴汬⁹楳湧传䵓䐭瑡a僈潲楶敤愠洠慥畳敲敭瑮搠慩潬畧⁥湡⁤⁡慬敹⁲潴洠慥畳敲氠湥瑧⁨湡⁤湡汧⁥景猠来敭瑮ⱳ愠敲⁡畳牲畯摮摥戠⁹⁡猨浩汰⥥挠潬敳⁤慷⁹湡⁤牣慥整洠慥畳敲敭瑮瀠瑡獨⠠桷捩⁨污潳挠湡戠⁥浩潰瑲摥映潲⁡灧⁳慬敹⥲N￾￾￾þ倷潲楶敤⁳⁡楤污杯敵映牯攠楤楴杮琠条⁳湩愠琠扡汵牡朠楲⹤脀畓灰牯獴搠睯汮慯楤杮琠汩摥‬捳湡敮⁤慭獰映潲慷歬湩ⵧ慰数獲漮杲‮桔獩瀠畬ⵧ湩椠⁳瑳汩湵敤⁲慥汲⁹敤敶潬浰湥⁴湡⁤慭⁹敢戠杵祧Nþ咖敨䴠灡畄瑳倠畬ⵧ湉猠潨獷琠敨䴠灡畄瑳戠杵爠灥牯獴漠桴⁥慭⹰夠畯挠湡挠敲瑡ⱥ挠潬敳‬湩慶楬慤整‬敲漭数湡⁤潣浭湥⁴畢⁧敲潰瑲⁳祢甠楳杮琠楨⁳汰杵湩N￾￾þ呣楨⁳汰杵椭污潬獷琠楤灳慬⁹湡⁹楰瑣牵⁥獡愠戠捡杫潲湵⁤湩琠敨攠楤潴⁲湡⁤污杩瑩眠瑩⁨桴⁥慭⹰开桔獩瀠畬ⵧ湩搠物捥汴⁹灵潬摡䜠卐吠慲散⁳牦浯挠牵敲瑮愠瑣癩⁥慬敹⁲湩䨠协⁍潴漠数獮牴敥浴灡漮杲.呋楨⁳汰杵椭楳灭楬楦獥琠敨洠灡楰杮愠摮攠楤楴杮漠⁦異汢捩琠慲獮潰瑲爠畯整⹳㈀楖畳污獩獥爠畯楴杮椠普牯慭楴湯愠⁳⁡潲瑵湩⁧牧灡⹨￿
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-01 03:41+0100\n"
"POT-Creation-Date: 2016-03-12 03:47+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: 2016-03-01 04:31+0000\n"
"X-Generator: Launchpad (build 17925)\n"
"X-Launchpad-Export-Date: 2016-03-12 04:31+0000\n"
"X-Generator: Launchpad (build 17939)\n"
"Language: af\n"
msgid "{0}: option ''{1}'' is ambiguous"
......@@ -1030,15 +1030,15 @@ msgid ""
"projection to get rid of this warning.<br>Do you want to continue?</html>"
msgstr ""
msgid "Selection must consist only of ways and nodes."
msgstr ""
msgid "Orthogonalize"
msgstr ""
msgid "Usage"
msgstr ""
msgid "Selection must consist only of ways and nodes."
msgstr ""
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
......@@ -3654,6 +3654,9 @@ msgstr ""
msgid "Polar Stereographic: Parameter ''{0}'' must be 90 or -90."
msgstr ""
msgid "Sinusoidal"
msgstr ""
msgid "Swiss Oblique Mercator"
msgstr ""
......@@ -3686,6 +3689,9 @@ msgstr ""
msgid "E-mail address contains an invalid domain: {0}"
msgstr ""
msgid "Email validator"
msgstr ""
msgid "URL is invalid"
msgstr ""
......@@ -3704,6 +3710,9 @@ msgstr ""
msgid "URL contains an invalid fragment: {0}"
msgstr ""
msgid "URL validator"
msgstr ""
msgid "Addresses"
msgstr ""
......@@ -4109,6 +4118,15 @@ msgstr ""
msgid "Missing power tower/pole within power line"
msgstr ""
msgid "Public Transport Route"
msgstr ""
msgid "Route relation contains a ''{0}'' role"
msgstr ""
msgid "Route relation contains a gap"
msgstr ""
msgid "Role verification problem"
msgstr ""
......@@ -6151,9 +6169,6 @@ msgid_plural "{0} users last edited the selection:"
msgstr[0] ""
msgstr[1] ""
msgid "xml"
msgstr ""
msgid "mapcss"
msgstr ""
......@@ -7346,6 +7361,15 @@ msgstr ""
msgid "The key ''{0}'' is already used"
msgstr ""
msgid "Ignore key ''{0}''"
msgstr ""
msgid "Ignore tag ''{0}''"
msgstr ""
msgid "Edit ignore list"
msgstr ""
msgid "You changed the value of ''{0}'' from ''{1}'' to ''{2}''."
msgstr ""
......@@ -9733,6 +9757,11 @@ msgstr ""
msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
"JOSM does no longer support mappaint styles written in the old XML format.\n"
"Please update ''{0}'' to MapCSS"
msgstr ""
msgid "loading style ''{0}''..."
msgstr ""
......@@ -9751,16 +9780,6 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
msgstr ""
msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
msgstr ""
......@@ -14003,9 +14022,6 @@ msgstr ""
msgid "reserved"
msgstr ""
msgid "Unable to delete old preferences file {0}"
msgstr ""
msgid "Outdated Java version"
msgstr ""
......@@ -15776,6 +15792,9 @@ msgstr ""
msgid "Import vector graphics (SVG)"
msgstr ""
msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
......@@ -17081,6 +17100,53 @@ msgstr ""
msgid "Motorcycle brand"
msgstr ""
msgid "From (initial stop)"
msgstr ""
msgid "To (terminal stop)"
msgstr ""
msgid "Via (intermediate stops)"
msgstr ""
msgid "Network"
msgstr ""
msgid "Color (HTML name or hexadecimal code)"
msgstr ""
msgctxt "color"
msgid "black"
msgstr ""
msgctxt "color"
msgid "brown"
msgstr ""
msgctxt "color"
msgid "green"
msgstr ""
msgctxt "color"
msgid "red"
msgstr ""
msgctxt "color"
msgid "blue"
msgstr ""
msgctxt "color"
msgid "gray"
msgstr ""
msgctxt "color"
msgid "white"
msgstr ""
msgctxt "color"
msgid "#CD853F"
msgstr ""
msgid "Streets"
msgstr ""
......@@ -18740,7 +18806,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
msgid "Public Transport Route"
msgid "Public Transport Route (Rail)"
msgstr ""
msgid "Route type"
......@@ -18755,59 +18821,6 @@ msgstr ""
msgid "light_rail"
msgstr ""
msgid "trolleybus"
msgstr ""
msgid "aerialway"
msgstr ""
msgid "From (initial stop)"
msgstr ""
msgid "To (terminal stop)"
msgstr ""
msgid "Via (intermediate stops)"
msgstr ""
msgid "Network"
msgstr ""
msgid "Color (HTML name or hexadecimal code)"
msgstr ""
msgctxt "color"
msgid "black"
msgstr ""
msgctxt "color"
msgid "brown"
msgstr ""
msgctxt "color"
msgid "green"
msgstr ""
msgctxt "color"
msgid "red"
msgstr ""
msgctxt "color"
msgid "blue"
msgstr ""
msgctxt "color"
msgid "gray"
msgstr ""
msgctxt "color"
msgid "white"
msgstr ""
msgctxt "color"
msgid "#CD853F"
msgstr ""
msgid "stop position"
msgstr ""
......@@ -18829,9 +18842,18 @@ msgstr ""
msgid "route segment"
msgstr ""
msgid "Public Transport Route (Bus)"
msgstr ""
msgid "trolleybus"
msgstr ""
msgid "Route Master"
msgstr ""
msgid "aerialway"
msgstr ""
msgid "route variant/direction (at least 2)"
msgstr ""
......@@ -26922,6 +26944,21 @@ msgstr ""
msgid "Please open or create data layer before importing"
msgstr ""