Skip to content
Commits on Source (5)
Show whitespace changes
Inline Side-by-side
REVISION
View file @ c4d70cc3
<?xml version="1.0" encoding="UTF-8"?>
<info>
<entry
kind="dir"
path="trunk"
revision="15150"
kind="dir">
revision="15155">
<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="15150">
revision="15155">
<author>Don-vip</author>
<date>2019-06-01T21:08:04.930238Z</date>
<date>2019-06-02T22:05:30.873405Z</date>
</commit>
</entry>
</info>
data/validator/geometry.mapcss
View file @ c4d70cc3
......@@ -384,3 +384,11 @@ way[route=ferry]!:closed >[index= 1] node[amenity!=ferry_terminal][man_made!=pie
way[route=ferry]!:closed >[index=-1] node[amenity!=ferry_terminal][man_made!=pier]!.node_in_terminal_pier!.node_in_ferry_bridge_tunnel:in-downloaded-area {
throwWarning: tr("Ferry route is not connected to a ferry terminal or branches.");
}
/* #10391 - Many misuses of building=hangar instead of building=barn/industrial/warehouse */
area:closed2[aeroway] ⊉ way[building=hangar][!aeroway] {
throwWarning: tr("{0} outside of {1}", "{0.tag}", "aeroway");
suggestAlternative: "building=barn";
suggestAlternative: "building=industrial";
suggestAlternative: "building=warehouse";
}
debian/changelog
View file @ c4d70cc3
josm (0.0.svn15155+dfsg-1~exp1) experimental; urgency=medium
* New hotfix tested snapshot.
* Add version constraint for josm-l10n dependency.
-- Bas Couwenberg <sebastic@debian.org> Mon, 03 Jun 2019 05:51:55 +0200
josm (0.0.svn15150+dfsg-1~exp1) experimental; urgency=medium
* New tested snapshot.
......
debian/control
View file @ c4d70cc3
......@@ -36,7 +36,7 @@ Depends: default-jre (>= 2:1.9) | java9-runtime,
openjfx,
proj-data,
${misc:Depends}
Recommends: josm-l10n
Recommends: josm-l10n (= ${source:Version})
Conflicts: josm-plugins
Description: Editor for OpenStreetMap
JOSM is an editor for OpenStreetMap (OSM) written in Java.
......
i18n/po/af.po
View file @ c4d70cc3
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-31 03:33+0200\n"
"POT-Creation-Date: 2019-06-02 03:33+0200\n"
"PO-Revision-Date: 2018-05-18 08:09+0000\n"
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
"Language-Team: Afrikaans <af@li.org>\n"
......@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Launchpad-Export-Date: 2019-06-01 04:31+0000\n"
"X-Launchpad-Export-Date: 2019-06-02 04:31+0000\n"
"X-Generator: Launchpad (build 18968)\n"
"Language: af\n"
 
......@@ -24930,6 +24930,9 @@ msgstr ""
msgid "Ferry route is not connected to a ferry terminal or branches."
msgstr ""
 
msgid "{0} outside of {1}"
msgstr ""
msgid "abbreviated street name"
msgstr ""
 
......
i18n/po/ak.po
View file @ c4d70cc3
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2019-05-31 03:33+0200\n"
"POT-Creation-Date: 2019-06-02 03:33+0200\n"
"PO-Revision-Date: 2018-06-07 19:03+0000\n"
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
"Language-Team: Akan <ak@li.org>\n"
......@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Launchpad-Export-Date: 2019-06-01 04:31+0000\n"
"X-Launchpad-Export-Date: 2019-06-02 04:31+0000\n"
"X-Generator: Launchpad (build 18968)\n"
 
msgid "Background Terms of Use"
......@@ -24926,6 +24926,9 @@ msgstr ""
msgid "Ferry route is not connected to a ferry terminal or branches."
msgstr ""
 
msgid "{0} outside of {1}"
msgstr ""
msgid "abbreviated street name"
msgstr ""
 
......
i18n/po/am.po
View file @ c4d70cc3
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-31 03:33+0200\n"
"POT-Creation-Date: 2019-06-02 03:33+0200\n"
"PO-Revision-Date: 2018-05-18 08:09+0000\n"
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
"Language-Team: Amharic <am@li.org>\n"
......@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Launchpad-Export-Date: 2019-06-01 04:32+0000\n"
"X-Launchpad-Export-Date: 2019-06-02 04:32+0000\n"
"X-Generator: Launchpad (build 18968)\n"
"Language: am\n"
 
......@@ -24927,6 +24927,9 @@ msgstr ""
msgid "Ferry route is not connected to a ferry terminal or branches."
msgstr ""
 
msgid "{0} outside of {1}"
msgstr ""
msgid "abbreviated street name"
msgstr ""
 
......
i18n/po/ar.po
View file @ c4d70cc3
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-31 03:33+0200\n"
"POT-Creation-Date: 2019-06-02 03:33+0200\n"
"PO-Revision-Date: 2018-07-23 20:54+0000\n"
"Last-Translator: J H <Unknown>\n"
"Language-Team: Arabic <ar@li.org>\n"
......@@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
"X-Launchpad-Export-Date: 2019-06-01 04:33+0000\n"
"X-Launchpad-Export-Date: 2019-06-02 04:33+0000\n"
"X-Generator: Launchpad (build 18968)\n"
"Language: ar\n"
 
......@@ -25013,6 +25013,9 @@ msgstr ""
msgid "Ferry route is not connected to a ferry terminal or branches."
msgstr ""
 
msgid "{0} outside of {1}"
msgstr ""
msgid "abbreviated street name"
msgstr ""
 
......
i18n/po/as.po
View file @ c4d70cc3
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2019-05-31 03:33+0200\n"
"POT-Creation-Date: 2019-06-02 03:33+0200\n"
"PO-Revision-Date: 2018-06-07 19:01+0000\n"
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
"Language-Team: Assamese <as@li.org>\n"
......@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n!=1;\n"
"X-Launchpad-Export-Date: 2019-06-01 04:34+0000\n"
"X-Launchpad-Export-Date: 2019-06-02 04:34+0000\n"
"X-Generator: Launchpad (build 18968)\n"
 
msgid "Background Terms of Use"
......@@ -24926,6 +24926,9 @@ msgstr ""
msgid "Ferry route is not connected to a ferry terminal or branches."
msgstr ""
 
msgid "{0} outside of {1}"
msgstr ""
msgid "abbreviated street name"
msgstr ""
 
......
i18n/po/ast.po
View file @ c4d70cc3
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-31 03:33+0200\n"
"POT-Creation-Date: 2019-06-02 03:33+0200\n"
"PO-Revision-Date: 2018-05-18 08:09+0000\n"
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
"Language-Team: Asturian <ast@li.org>\n"
......@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Launchpad-Export-Date: 2019-06-01 04:34+0000\n"
"X-Launchpad-Export-Date: 2019-06-02 04:34+0000\n"
"X-Generator: Launchpad (build 18968)\n"
"Language: ast\n"
 
......@@ -26527,6 +26527,9 @@ msgstr ""
msgid "Ferry route is not connected to a ferry terminal or branches."
msgstr ""
 
msgid "{0} outside of {1}"
msgstr ""
msgid "abbreviated street name"
msgstr "nome de cai embrivíu"
 
......
i18n/po/awa.po
View file @ c4d70cc3
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2019-05-31 03:33+0200\n"
"POT-Creation-Date: 2019-06-02 03:33+0200\n"
"PO-Revision-Date: 2018-06-07 18:58+0000\n"
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
"Language-Team: Awadhi <awa@li.org>\n"
......@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
"X-Launchpad-Export-Date: 2019-06-01 04:35+0000\n"
"X-Launchpad-Export-Date: 2019-06-02 04:35+0000\n"
"X-Generator: Launchpad (build 18968)\n"
 
msgid "Background Terms of Use"
......@@ -24926,6 +24926,9 @@ msgstr ""
msgid "Ferry route is not connected to a ferry terminal or branches."
msgstr ""
 
msgid "{0} outside of {1}"
msgstr ""
msgid "abbreviated street name"
msgstr ""
 
......
i18n/po/az.po
View file @ c4d70cc3
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2019-05-31 03:33+0200\n"
"POT-Creation-Date: 2019-06-02 03:33+0200\n"
"PO-Revision-Date: 2018-05-18 08:09+0000\n"
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
"Language-Team: Azerbaijani <az@li.org>\n"
......@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Launchpad-Export-Date: 2019-06-01 04:35+0000\n"
"X-Launchpad-Export-Date: 2019-06-02 04:35+0000\n"
"X-Generator: Launchpad (build 18968)\n"
 
msgid "Background Terms of Use"
......@@ -24928,6 +24928,9 @@ msgstr ""
msgid "Ferry route is not connected to a ferry terminal or branches."
msgstr ""
 
msgid "{0} outside of {1}"
msgstr ""
msgid "abbreviated street name"
msgstr ""
 
......
i18n/po/be.po
View file @ c4d70cc3
......@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-31 03:33+0200\n"
"POT-Creation-Date: 2019-06-02 03:33+0200\n"
"PO-Revision-Date: 2019-01-18 21:13+0000\n"
"Last-Translator: Viktar Palsciuk <Unknown>\n"
"Language-Team: Belarusian <i18n@mova.org>\n"
......@@ -19,7 +19,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Launchpad-Export-Date: 2019-06-01 04:36+0000\n"
"X-Launchpad-Export-Date: 2019-06-02 04:36+0000\n"
"X-Generator: Launchpad (build 18968)\n"
"Language: be\n"
 
......@@ -26694,6 +26694,9 @@ msgstr ""
msgid "Ferry route is not connected to a ferry terminal or branches."
msgstr ""
 
msgid "{0} outside of {1}"
msgstr ""
msgid "abbreviated street name"
msgstr "скарочанае пазначэнне вуліцы"
 
i18n/po/bg.po
View file @ c4d70cc3
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-31 03:33+0200\n"
"POT-Creation-Date: 2019-06-02 03:33+0200\n"
"PO-Revision-Date: 2018-12-13 20:19+0000\n"
"Last-Translator: pl <Unknown>\n"
"Language-Team: Bulgarian <bg@li.org>\n"
......@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Launchpad-Export-Date: 2019-06-01 04:38+0000\n"
"X-Launchpad-Export-Date: 2019-06-02 04:38+0000\n"
"X-Generator: Launchpad (build 18968)\n"
"Language: bg\n"
 
......@@ -25233,6 +25233,9 @@ msgstr ""
msgid "Ferry route is not connected to a ferry terminal or branches."
msgstr ""
 
msgid "{0} outside of {1}"
msgstr ""
msgid "abbreviated street name"
msgstr "съкратено име на улица"
 
......
i18n/po/bn.po
View file @ c4d70cc3
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-31 03:33+0200\n"
"POT-Creation-Date: 2019-06-02 03:33+0200\n"
"PO-Revision-Date: 2018-05-18 08:09+0000\n"
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
"Language-Team: Bengali <bn@li.org>\n"
......@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Launchpad-Export-Date: 2019-06-01 04:37+0000\n"
"X-Launchpad-Export-Date: 2019-06-02 04:36+0000\n"
"X-Generator: Launchpad (build 18968)\n"
"Language: bn\n"
 
......@@ -24935,6 +24935,9 @@ msgstr ""
msgid "Ferry route is not connected to a ferry terminal or branches."
msgstr ""
 
msgid "{0} outside of {1}"
msgstr ""
msgid "abbreviated street name"
msgstr ""
 
......
i18n/po/br.po
View file @ c4d70cc3
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-31 03:33+0200\n"
"POT-Creation-Date: 2019-06-02 03:33+0200\n"
"PO-Revision-Date: 2018-05-18 08:09+0000\n"
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
"Language-Team: Breton <br@li.org>\n"
......@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Launchpad-Export-Date: 2019-06-01 04:37+0000\n"
"X-Launchpad-Export-Date: 2019-06-02 04:37+0000\n"
"X-Generator: Launchpad (build 18968)\n"
"Language: br\n"
 
......@@ -24930,6 +24930,9 @@ msgstr ""
msgid "Ferry route is not connected to a ferry terminal or branches."
msgstr ""
 
msgid "{0} outside of {1}"
msgstr ""
msgid "abbreviated street name"
msgstr ""
 
......
i18n/po/bs.po
View file @ c4d70cc3
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-31 03:33+0200\n"
"POT-Creation-Date: 2019-06-02 03:33+0200\n"
"PO-Revision-Date: 2018-05-18 08:09+0000\n"
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
"Language-Team: Bosnian <bs@li.org>\n"
......@@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Launchpad-Export-Date: 2019-06-01 04:37+0000\n"
"X-Launchpad-Export-Date: 2019-06-02 04:37+0000\n"
"X-Generator: Launchpad (build 18968)\n"
"Language: bs\n"
 
......@@ -24935,6 +24935,9 @@ msgstr ""
msgid "Ferry route is not connected to a ferry terminal or branches."
msgstr ""
 
msgid "{0} outside of {1}"
msgstr ""
msgid "abbreviated street name"
msgstr ""
 
......
i18n/po/ca.po
View file @ c4d70cc3
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-31 03:33+0200\n"
"POT-Creation-Date: 2019-06-02 03:33+0200\n"
"PO-Revision-Date: 2019-03-16 16:36+0000\n"
"Last-Translator: Don-vip <vincent.privat@gmail.com>\n"
"Language-Team: el_libre - - www.catmidia.cat\n"
......@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Launchpad-Export-Date: 2019-06-01 04:39+0000\n"
"X-Launchpad-Export-Date: 2019-06-02 04:39+0000\n"
"X-Generator: Launchpad (build 18968)\n"
"Language: ca\n"
 
......@@ -26663,6 +26663,9 @@ msgstr ""
msgid "Ferry route is not connected to a ferry terminal or branches."
msgstr ""
 
msgid "{0} outside of {1}"
msgstr ""
msgid "abbreviated street name"
msgstr "nom abreviat del carrer"
 
......
i18n/po/ca@valencia.po
View file @ c4d70cc3
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-31 03:33+0200\n"
"POT-Creation-Date: 2019-06-02 03:33+0200\n"
"PO-Revision-Date: 2018-05-18 08:09+0000\n"
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
"Language-Team: el_libre - - www.catmidia.cat\n"
......@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Launchpad-Export-Date: 2019-06-01 05:29+0000\n"
"X-Launchpad-Export-Date: 2019-06-02 05:29+0000\n"
"X-Generator: Launchpad (build 18968)\n"
"Language: ca@valencia\n"
 
......@@ -26391,6 +26391,9 @@ msgstr ""
msgid "Ferry route is not connected to a ferry terminal or branches."
msgstr ""
 
msgid "{0} outside of {1}"
msgstr ""
msgid "abbreviated street name"
msgstr "nom abreviat del carrer"
 
......
i18n/po/ceb.po
View file @ c4d70cc3
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2019-05-31 03:33+0200\n"
"POT-Creation-Date: 2019-06-02 03:33+0200\n"
"PO-Revision-Date: 2018-06-07 18:58+0000\n"
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
"Language-Team: Cebuano <ceb@li.org>\n"
......@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Launchpad-Export-Date: 2019-06-01 04:39+0000\n"
"X-Launchpad-Export-Date: 2019-06-02 04:39+0000\n"
"X-Generator: Launchpad (build 18968)\n"
 
msgid "Background Terms of Use"
......@@ -24926,6 +24926,9 @@ msgstr ""
msgid "Ferry route is not connected to a ferry terminal or branches."
msgstr ""
 
msgid "{0} outside of {1}"
msgstr ""
msgid "abbreviated street name"
msgstr ""
 
......